jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
cxt 2016-11-11 17:38:25 +08:00
parent e1c216ef80 d040d2efd1
commit 18bfb26689
3 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/projects/settings/_new_members.html.erb
View File

@ -70,7 +70,7 @@
<% members.each do |member| %>
<tr>
<th><%= i += 1 %></th>
<th><%= link_to member.principal.show_name, user_path(member.principal) %></th>
<th><%= link_to member.principal.show_name, user_path(member.principal), :target => "_blank" %></th>
<th>
<% if User.current.language == "zh" %>

28
app/views/repositories/_dir_list.html.erb
View File

@ -1,18 +1,20 @@
<div class="autoscroll">
<table class="list entries mt5" id="browser" style="table-layout: fixed;">
<tbody>
<tr style="border: 1px solid #DDD; border-bottom:none;">
<td>
<a href="<%= project_roadmap_path(@project) %>" class="fl linkBlue2 mt3" >
<span class="new_roadmap_icons_back mr5"></span>
返回上级目录
</a>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
<% unless @path.blank? %>
<tbody>
<tr style="border: 1px solid #DDD; border-bottom:none;">
<td>
<a href="javascript:history.go(-1)" class="fl linkBlue2 mt3" >
<span class="new_roadmap_icons_back mr5"></span>
返回上级目录
</a>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
<% end %>
<tbody style="line-height: 1.9;">
<%= render :partial => 'dir_list_content' %>
</tbody>

17
db/schema.rb
View File

@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20161111070615) do
ActiveRecord::Schema.define(:version => 20161111081619) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@ -518,20 +518,6 @@ ActiveRecord::Schema.define(:version => 20161111070615) do
t.integer "container_id", :default => 0
end
create_table "course_class_post", :id => false, :force => true do |t|
t.integer "班级id", :default => 0, :null => false
t.string "班级名"
t.integer "帖子id", :default => 0, :null => false
t.integer "主贴id"
t.string "帖子标题", :default => "", :null => false
t.text "帖子内容"
t.integer "帖子用户id"
t.integer "帖子回复数", :default => 0, :null => false
t.integer "最后回帖id"
t.datetime "发帖时间", :null => false
t.datetime "帖子更新时间", :null => false
end
create_table "course_contributor_scores", :force => true do |t|
t.integer "course_id"
t.integer "user_id"
@ -1876,6 +1862,7 @@ ActiveRecord::Schema.define(:version => 20161111070615) do
t.integer "is_leader"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.integer "course_id"
end
add_index "student_work_projects", ["homework_common_id"], :name => "index_student_work_projects_on_homework_common_id"