From 8f0af4c00d2fc461cc5dc30b9d192d40248fcdf0 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 11 Mar 2015 16:42:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=9C=AA=E7=99=BB?=
 =?UTF-8?q?=E9=99=86=E6=83=85=E5=86=B5=E4=B8=8B=E9=80=9A=E8=BF=87URL?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E4=B8=8D=E5=85=81=E8=AE=BF=E9=97=AE=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb   | 21 ++++++++++++++++-----
 app/views/layouts/base_projects.html.erb |  8 ++++----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 052df384e..954006e42 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -347,16 +347,27 @@ class ProjectsController < ApplicationController
   end
   #发送邮件邀请新用户
   def invite_members_by_mail
-    @is_zhuce =false
-    respond_to do |format|
-      format.html
-      format.js
+    if User.current.member_of?(@project) || User.current.admin? 
+      @is_zhuce = false
+      respond_to do |format|
+        format.html
+        format.js
+      end
+    else
+      render_403
     end
   end
 
   # 邀请Trustie注册用户
   def invite_members
-    @member ||= @project.members.new
+    if User.current.member_of?(@project) || User.current.admin? 
+      @member ||= @project.members.new
+        respond_to do |format|
+        format.html
+      end
+    else
+      render_403
+    end
   end
 
   def edit
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 6456b0090..e3172b8cf 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -140,27 +140,27 @@
 										<div class="subNav">
 											<%= link_to l(:label_issue_tracking), project_issues_path(@project), :style => "color:#3CA5C6" %><span  class="subnav_num">(<%= @project.issues.count %>)</span>
 											<span>
-                                              <% if User.current.logged? &&  User.current.member_of?(@project) %>
+                                              <% if User.current.member_of?(@project) %>
                                                 <%= link_to "+发布问题", new_project_issue_path(@project) , :style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %></span>
                                               <% end %>
 										</div>
 										<div class="subNav">
 											<%= link_to "讨论区", project_boards_path(@project), :style => "color:#3CA5C6" %>
 											<span  class="subnav_num">(<%= @project.boards.first.topics.count %>)</span>
-                                            <% if User.current.logged? &&  User.current.member_of?(@project) %>
+                                            <% if User.current.member_of?(@project) %>
 											    <%= link_to "+发贴", project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %>
 										    <% end %>
                                         </div>
 										<div class="subNav">
 											<%= link_to l(:label_course_file), project_files_path(@project), :style => "color:#3CA5C6" %><span  class="subnav_num">(<%= @project.attachments.count  %>)</span>
-                                            <% if User.current.logged? &&  User.current.member_of?(@project) %>
+                                            <% if User.current.member_of?(@project) %>
                                                 <%= link_to "+上传资源", new_project_file_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
 										    <% end %>
                                         </div>
 										<div class="subNav">
 											<%= link_to l(:field_user_active_changeset), {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>
 											<span  class="subnav_num">(<%= @project.repositories.count %>)</span>
-                                            <% if User.current.logged? &&  User.current.member_of?(@project) %>
+                                            <% if User.current.member_of?(@project) %>
 											    <%= link_to "+创建版本库",  new_project_repository_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
                                             <% end %>
 										</div>