From 5cf198c61ae5b554333da3af5111a616fa2d054c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 3 Mar 2016 17:59:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=95=99=E5=B8=88=E3=80=81?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E7=AE=A1=E7=90=86=E5=85=A5=E5=8F=A3=EF=BC=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/member.html.erb        |  2 +-
 app/views/projects/member.html.erb       |  7 ++++++-
 app/views/projects/settings.html.erb     | 10 +++++-----
 app/views/users/_resources_list.html.erb | 16 ++++++++--------
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb
index 2fe18c4eb..7a58315a2 100644
--- a/app/views/courses/member.html.erb
+++ b/app/views/courses/member.html.erb
@@ -2,7 +2,7 @@
   <h2 class="project_h2 fl"><%= @subPage_title%></h2>
   <% if User.current.allowed_to?(:as_teacher,@course) %>
     <span class="fr f14 fontGrey2" style="height: 40px; line-height: 40px; margin-right: 15px;">
-      <%=link_to "修改角色", :controller => 'courses', :action => 'settings', :id => @course.id, :tab=>'member' %>
+      <%=link_to "成员管理", :controller => 'courses', :action => 'settings', :id => @course.id, :tab=>'member' %>
     </span>
   <% end %>
 </div>
diff --git a/app/views/projects/member.html.erb b/app/views/projects/member.html.erb
index e6760d3b3..21ce71b47 100644
--- a/app/views/projects/member.html.erb
+++ b/app/views/projects/member.html.erb
@@ -1,5 +1,10 @@
 <div class="project_r_h">
-  <h2 class="project_h2"><%= @subPage_title %></h2>
+  <h2 class="project_h2 fl"><%= @subPage_title%></h2>
+  <% if is_project_manager?(User.current, @project) %>
+    <span class="fr f14 fontGrey2" style="height: 40px; line-height: 40px; margin-right: 15px;">
+      <%=link_to "成员管理", :controller => 'projects', :action => 'settings', :id => @project.id, :tab => 'members' %>
+    </span>
+  <% end %>
 </div>
 <div class="member_content">
 	<%= error_messages_for 'member' %>
diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb
index 76258b9e9..9eae5d65b 100644
--- a/app/views/projects/settings.html.erb
+++ b/app/views/projects/settings.html.erb
@@ -1,17 +1,17 @@
 <script type="text/javascript">
     $(function(){
-        <%if @select_tab%>
-          <%if @select_tab == "modules"%>
+        <%if @select_tab %>
+          <% if @select_tab == "modules" %>
             project_setting(2);
-          <% elsif @select_tab == "members"%>
+          <% elsif @select_tab == "members" %>
             project_setting(3);
-          <% elsif @select_tab == "versions"%>
+          <% elsif @select_tab == "versions" %>
             project_setting(4);
             $("#pro_st_edit_ban").toggle();
           <% elsif @select_tab == "repositories" %>
             project_setting(6);
             $("#pro_st_edit_ku").toggle();
-          <%else%>
+          <% else %>
              project_setting(5);
           <% end%>
         <% end%>
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 87a13610c..b9b74760a 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -13,19 +13,19 @@
             <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack' %>
           </li>
           <li class="resource-list-time fr"><%= format_date(attach.created_on) %></li>
-          <li style="display: none"><%= attach.id %></li>
-          <li class="resource-list-quote fr">100</li>
-          <li style="display: none"><%= attach.id %></li>
-          <li class="resource-list-download fr">100</li>
-          <li style="display: none"><%= attach.id %></li>
+          <li style="display: none"><%= attach.author_id %></li>
+          <li class="resource-list-quote fr"><%= attach.quotes.nil? ? 0 : attach.quotes %></li>
+          <li style="display: none"><%= attach.author_id %></li>
+          <li class="resource-list-download fr"><%= attach.downloads %></li>
+          <li style="display: none"><%= attach.author_id %></li>
           <li class="resource-list-size fr"><%= number_to_human_size(attach.filesize) %></li>
-          <li style="display: none"><%= attach.id %></li>
+          <li style="display: none"><%= attach.author_id %></li>
           <li class="resource-list-uploader fr hidden"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
           <li style="display: none"><%= attach.author_id %></li>
           <li class="resource-list-type fr"><%= get_resource_type(attach.container_type)%></li>
-          <li style="display: none"><%= attach.id %></li>
+          <li style="display: none"><%= attach.author_id %></li>
           <li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach) %>"><%= get_resource_origin(attach) %></li>
-          <li style="display: none"><%= attach.id %></li>
+          <li style="display: none"><%= attach.author_id %></li>
         </ul>
         <div class="cl"></div>
     <% end %>