From 774650c819b5f64044219addf384cd8358ddcdda Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 25 Jul 2016 15:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=82=80=E8=AF=B7=E7=A0=81?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=EF=BC=8C=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/project.rb                         | 1 +
 app/views/layouts/_join_exit_project.html.erb | 2 --
 app/views/layouts/base_projects.html.erb      | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 3333c805b..520407589 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -910,6 +910,7 @@ class Project < ActiveRecord::Base
   end
 
   # 生成邀请码
+  # 如果已有改邀请码，则重新生成
   CODES = %W(2 3 4 5 6 7 8 9 A B C D E F G H J K L N M O P Q R S T U V W X Y Z)
   def generate_invite_code
     code = read_attribute(:invite_code)
diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb
index 35d8f87ef..e893949f4 100644
--- a/app/views/layouts/_join_exit_project.html.erb
+++ b/app/views/layouts/_join_exit_project.html.erb
@@ -2,9 +2,7 @@
    <!--关注:非项目成员-->
   <% if !User.current.member_of?(@project) && User.current.login? && !User.current.admin %>
       <span><%= watcher_link_for_project(@project, User.current) %></span>
-  <% end %>
   <!--加入项目 -->
-  <% if !User.current.member_of?(@project) && User.current.login? && !User.current.admin  %>
       <%= join_in_project_link(@project, User.current) %>
   <% end %>
   <!--配置项目-->
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index f68f4c86f..e7b23b3b5 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -53,7 +53,8 @@
           <%= image_tag(url_to_avatar(@project), :width => "60", :height => "60") %>
         </div>
         <div class="pr_info_id fl mb5 f14">
-          <%= l(:label_project_ivite_code)%><%= @project.generate_invite_code %>
+          <%= l(:label_project_ivite_code)%>
+          <%= (User.current.member_of?(@project) || User.current.admin?) ? @project.invite_code : "******" %>
         </div>
         <!--关注、申请加入/退出项目-->
         <div id="join_exit_project_div">