From 2043b963c84794d07eb3a6120865f7406c3d13fa Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 21 Apr 2015 16:35:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=84=8F=E8=A7=81=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=20=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_join_exit_project.html.erb | 2 +-
 app/views/layouts/base_projects.html.erb      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb
index 13baae37f..8b4b897ce 100644
--- a/app/views/layouts/_join_exit_project.html.erb
+++ b/app/views/layouts/_join_exit_project.html.erb
@@ -8,7 +8,7 @@
       <%= join_in_project_link(@project, User.current) %>
   <% end %>
   <!--退出项目-->
-  <% if ((User.current.member_of? @project) && User.current.login? && User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)) %>
+  <% if User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)  %>
       <%= link_to "<span class='pr_setting'></span>#{l(:button_configure)}".html_safe, settings_project_path(@project), :class => "pr_join_a" %>
       <%= link_to "<span class='#{get_project_type_css(@project_type_new)}'></span>#{text}".html_safe,"javascript:void(0)" ,:onClick => "show_window();", :class => "pr_join_a",:id => "setting_project_type"%>
   <% end %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index b825800e1..f3dc61c8a 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -234,6 +234,7 @@
       </div>
     </div>
     <div id="fade" class="black_overlay">123</div>
+    <%= render :partial => 'layouts/new_feedback' %>
 	<div id="ajax-indicator" style="display:none;">
 		<span><%= l(:label_loading) %></span>
 	</div>