From 532a8cb5c3f7239db0fb623beec5078fc7171b2e Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 17 Apr 2015 14:20:53 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E5=B1=95=E5=BC=80=E8=BE=93=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/settings.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb
index 6fe71d7c3..d3499cfdd 100644
--- a/app/views/projects/settings.html.erb
+++ b/app/views/projects/settings.html.erb
@@ -5,8 +5,10 @@
           project_setting(2);
           <% 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%>
 
           <% end%>

From 15e54dd7653f4484ab9c5d7f9e2941024c04ac52 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 17 Apr 2015 14:21:18 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=20=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/versions_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index 36ce47d9e..2389284b8 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -116,7 +116,8 @@ class VersionsController < ApplicationController
         end
       else
         respond_to do |format|
-          format.html { render :action => 'new' }
+          format.html {  flash[:error] = @version.errors.full_messages.to_s
+          redirect_to settings_project_url(@project, :tab => 'versions') }
           format.js   { render :action => 'new' }
           format.api  { render_validation_errors(@version) }
         end

From 17f9ed52ce70f05804522ca3231a04d5f07385ff Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 17 Apr 2015 14:21:43 +0800
Subject: [PATCH 3/6] =?UTF-8?q?Wiki=E5=88=97=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/settings/_new_versions.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb
index ffc301cf5..ae2250774 100644
--- a/app/views/projects/settings/_new_versions.html.erb
+++ b/app/views/projects/settings/_new_versions.html.erb
@@ -14,7 +14,7 @@
     <td class="w90"><%= l(:field_description) %> </td>
     <td class=""><%= l(:field_status) %></td>
     <td class=""><%= l(:field_sharing) %></td>
-    <td class=""><%= l(:label_wiki_page) %></td>
+    <td class="w90"><%= l(:label_wiki_page) %></td>
     <td class=""></td>
   </tr>
   <% for version in @project.shared_versions.sort %>
@@ -58,7 +58,7 @@
   <ul>
     <li >
       <label class="label02"><span class="c_red">*</span><%=l(:field_name)%>：</label>
-      <%= f.text_field :name, :maxlength => 60, :required => true %>
+      <%= f.text_field :name, :maxlength => 60 %>
     </li>
     <li >
       <label class="label02"><%=l(:label_version_description)%>：</label>

From 7239f6a641ea77af4e35f7ddcfcb58885c37abb9 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 17 Apr 2015 14:21:44 +0800
Subject: [PATCH 4/6] =?UTF-8?q?1=E3=80=81=E6=88=90=E5=91=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=88=86=E9=A1=B5=E7=A9=BA=E9=97=B4=E7=BF=BB=E9=A1=B5?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=94=A8=202=E3=80=81=E5=BD=93=E4=BA=94?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=97=B6=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/members_helper.rb                     | 6 +++++-
 app/views/projects/settings/_new_members.html.erb | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index 7c0cc45d1..34c6dad15 100644
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -32,7 +32,11 @@ module MembersHelper
 
   #获取项目可邀请的成员列表
   def render_project_members project
-    scope = Principal.active.sorted.not_member_of(project).like(params[:q])
+    if params[:q] && params[:q] != ""
+      scope = Principal.active.sorted.not_member_of(project).like(params[:q])
+    else
+      scope = []
+    end
     principals = paginateHelper scope,10
     s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5')
     links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options|
diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index 22fb70292..f2b48d341 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -96,7 +96,7 @@
             <div class="cl"></div>
 
             <div id="principals_for_new_member">
-              <%= render_principals_for_new_project_members(@project) %>
+              <%= render_project_members(@project) %>
             </div>
             <div class="cl"></div>
 

From 3c174929010af6446ebab0315d916fd4090fa8af Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 17 Apr 2015 14:22:08 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=97=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/settings/_new_versions.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb
index ae2250774..74d4df53b 100644
--- a/app/views/projects/settings/_new_versions.html.erb
+++ b/app/views/projects/settings/_new_versions.html.erb
@@ -11,10 +11,10 @@
   <tr class="pro_table_tit">
     <td class="w90"><%= l(:label_version) %></td>
     <td> <%= l(:field_effective_date) %></td>
-    <td class="w90"><%= l(:field_description) %> </td>
+    <td class="w150"><%= l(:field_description) %> </td>
     <td class=""><%= l(:field_status) %></td>
     <td class=""><%= l(:field_sharing) %></td>
-    <td class="w90"><%= l(:label_wiki_page) %></td>
+    <td class="w150"><%= l(:label_wiki_page) %></td>
     <td class=""></td>
   </tr>
   <% for version in @project.shared_versions.sort %>

From ade32aae0298bbc26ab23009aa6121b9d837481e Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 17 Apr 2015 14:27:26 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=97=E5=AE=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/settings/_new_versions.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb
index 74d4df53b..326b56f1d 100644
--- a/app/views/projects/settings/_new_versions.html.erb
+++ b/app/views/projects/settings/_new_versions.html.erb
@@ -9,13 +9,13 @@
 <table class="pro_table">
   <tbody>
   <tr class="pro_table_tit">
-    <td class="w90"><%= l(:label_version) %></td>
-    <td> <%= l(:field_effective_date) %></td>
+    <td class="w150"><%= l(:label_version) %></td>
+    <td class="w90" > <%= l(:field_effective_date) %></td>
     <td class="w150"><%= l(:field_description) %> </td>
-    <td class=""><%= l(:field_status) %></td>
-    <td class=""><%= l(:field_sharing) %></td>
+    <td class="w90"><%= l(:field_status) %></td>
+    <td class="w90"><%= l(:field_sharing) %></td>
     <td class="w150"><%= l(:label_wiki_page) %></td>
-    <td class=""></td>
+    <td class="w150"></td>
   </tr>
   <% for version in @project.shared_versions.sort %>
     <tr class="pro_table_on">