diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index a2a78fd9d..979f2d369 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -598,7 +598,9 @@ class ProjectsController < ApplicationController end def member_forked - @members_forked = User.find_by_sql("SELECT u.* FROM `projects` p,`users` u where p.user_id = u.id and p.forked_from_project_id = #{@project.id} ;") + @forked_projects = Project.where(:forked_from_project_id => @project.id) + + # @forked_members = User.find_by_sql("SELECT u.* FROM `projects` p,`users` u where p.user_id = u.id and p.forked_from_project_id = #{@project.id} ;") end def update_message_status(user, project) diff --git a/app/views/projects/_applied_status.html.erb b/app/views/projects/_applied_status.html.erb index 41bb08cbc..ec64a08ae 100644 --- a/app/views/projects/_applied_status.html.erb +++ b/app/views/projects/_applied_status.html.erb @@ -19,7 +19,7 @@ <% if User.current.id != @project.user_id %>
  • - 已加入 + 已加入 <%= Member.where(:project_id => @project.id).count %>
  • <%#= link_to "#{Member.where(:project_id => @project.id).count}", project_member_path(@project), :class => 'pro_new_topbtn fl', :title => "项目成员" %> diff --git a/app/views/projects/member_forked.html.erb b/app/views/projects/member_forked.html.erb index 45f783f69..488952057 100644 --- a/app/views/projects/member_forked.html.erb +++ b/app/views/projects/member_forked.html.erb @@ -1,3 +1,17 @@ -<% @members_forked.each do |id| %> - <% %> -<% end %> \ No newline at end of file +
    +

    成员本页面展示Fork了 <%= link_to @project.owner.try(:show_name), user_path(@project.owner) %>/<%= link_to @project.name, project_path(@project) %> 的用户

    + +
    diff --git a/db/schema.rb b/db/schema.rb index 3bf495cd9..7a00237f6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20161028053000) do +ActiveRecord::Schema.define(:version => 20161111064007) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -325,14 +325,16 @@ ActiveRecord::Schema.define(:version => 20161028053000) do add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids" create_table "changesets", :force => true do |t| - t.integer "repository_id", :null => false - t.string "revision", :null => false + t.integer "repository_id", :null => false + t.string "revision", :null => false t.string "committer" - t.datetime "committed_on", :null => false + t.datetime "committed_on", :null => false t.text "comments" t.date "commit_date" t.string "scmid" t.integer "user_id" + t.integer "project_id" + t.integer "type", :default => 0 end add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on" @@ -993,6 +995,10 @@ ActiveRecord::Schema.define(:version => 20161028053000) do t.datetime "updated_at", :null => false end + create_table "innodb_monitor", :id => false, :force => true do |t| + t.integer "a" + end + create_table "invite_lists", :force => true do |t| t.integer "project_id" t.integer "user_id" diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index e04e57e3e..a1d85e006 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -1029,4 +1029,13 @@ textarea.muban_textarea{ width: 98.5%;border:1px solid #ddd; background:#fff; co /* 课程大纲 */ .icons_tishi{ width: 110px; height: 110px;margin: 135px auto 20px;} -.sy_tab_con_p{ font-size: 16px;text-align: center; margin-bottom:100px; color:#888;} \ No newline at end of file +.sy_tab_con_p{ font-size: 16px;text-align: center; margin-bottom:100px; color:#888;} +/* 成员列表20161101byLB*/ +.pro_new_font{ font-weight: normal; color: #666; font-size: 12px;} +.pro_new_users_box{ margin:0 10px;} +.pro_new_users_box li{ width:25%; float: left; margin:10px 0;} +.pro_new_users{ } +a.pro_new_users { max-width:80px; overflow:hidden;overflow:hidden;text-overflow:ellipsis;white-space:nowrap; word-break:break-all; display: inline-block; font-weight: bold; color: #666;} +a:hover.pro_new_users {color: #3b94d6} +.pro_new_users img{ width:40px;height:40px; border: 3px solid #fff;-webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;} +.pro_new_users img:hover{border: 3px solid #e6e6e6;}