From b043d07d61f41cac581b1b63e66a5baec473891c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 7 Mar 2015 11:02:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=96=B0=E8=B4=B4=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_project_show.html.erb  | 5 ++---
 app/views/layouts/base_projects.html.erb | 2 ++
 public/stylesheets/application.css       | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 97ed903d9..25903f588 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -9,9 +9,8 @@
 </script>
 <div id="add-message" class="add_frame" style="display:none;">
   <% if User.current.logged? %>
-                           s
-      <div class="add_frame_header">
-        <%= l(:label_message_new) %>
+      <div class="project_r_h">
+        <h2 class="project_h2"><%= l(:label_message_new) %></h2>
       </div>
       <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
           <%= render :partial => 'messages/form', :locals => {:f => f} %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 40f13a2f8..fd4311fa2 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -127,11 +127,13 @@
 									</div><!--项目信息 end-->
 
 									<div class="subNavBox">
+                                        <% if User.current.member_of?(@project) %>
 										<div class="subNav currentDd currentDt subNav_jiantou">邀请</div>
 											<ul class="navContent " style="display:block; padding-left: 0px; margin-top:0px;">
 												<li><%=  link_to "发送邮件邀请新用户" %></li>
 												<li><%=  link_to "邀请Trustie注册用户", :controller=>"projects", :action=>"invite_members", :id => @project %></li>
 											</ul>
+                                        <% end %>
 										<div class="subNav">
 											<%= link_to "动态", {:controller => 'projects', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>
 										</div>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 7d3506124..70b49de3b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -67,7 +67,7 @@ a:hover.subnav_green{ background:#14ad5a;}
 .lg-foot:hover{ color:#787b7e;}
 /*右侧内容--动态*/
 
-.project_r_h{ height:40px; background:#eaeaea;}
+.project_r_h{ height:40px; background:#eaeaea; margin-bottom: 5px;}
 .project_h2{ background:#64bdd9; color:#fff; height:30px; width:90px; text-align:center; font-weight:normal; padding-top:3px; font-size:16px; padding-top:9px;}
 .project_r_box{ border:1px solid #e2e1e1; width:670px; margin-top:10px;}
 .project_h3 { color:#646464; font-size:14px; padding:0 10px; border-bottom:1px solid #e2e1e1;}

From ff2b4c610c1e489ef502573bb84196bb124876fa Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 7 Mar 2015 11:30:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=8A=A8=E6=80=81=E6=AF=8F=E9=A1=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9D=A1=E7=9B=AE=E4=B8=8D=E6=AD=A3=E7=A1=AE=202=E3=80=81?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81=E5=A2=9E=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E9=97=BB=E3=80=81=E7=95=99=E8=A8=80=E7=AD=89=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=9A=84=E8=A1=A5=E5=85=A8=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E9=83=A8=E5=88=86=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b3e808b19..00af13cb5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -442,16 +442,24 @@ class UsersController < ApplicationController
         watcher.push(User.current)
         activity = Activity.where(where_condition).where('user_id in (?)', watcher).order('id desc')
       else
-        activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc') 
+        activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc')
+        activity = activity.reject { |e|
+          !User.current.admin? &&
+              (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) ||
+              (e.act_type == "Bid" && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) ||
+              (e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) ||
+              (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) ||
+              (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course)))))
+        }
       end
       @activity_count = activity.count
       @activity_pages = Paginator.new @activity_count, pre_count, params['page']
-      @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page )
-      @activity = @activity.reject { |e|
-        ((e.act_type=="Issue") && ( !e.act.visible?(User.current))) ||
-            ((e.act_type == "Journal") && (!e.act.project.visible?(User.current))) ||
-            ((e.act_type == "Bid") && ((!User.current.member_of_course?(e.act.courses.first) || !User.current.admin?)))
-      }
+      @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page)
+      # @activity = @activity.reject { |e|
+      #   ((e.act_type=="Issue") && ( !e.act.visible?(User.current))) ||
+      #       ((e.act_type == "Journal") && (!e.act.project.visible?(User.current))) ||
+      #       ((e.act_type == "Bid") && ((!User.current.member_of_course?(e.act.courses.first) || !User.current.admin?)))
+      # }
       @state = 0
     end