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 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.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%> 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 @@
<%= l(:label_version) %> | -<%= l(:field_effective_date) %> | -<%= l(:field_description) %> | -<%= l(:field_status) %> | -<%= l(:field_sharing) %> | -<%= l(:label_wiki_page) %> | -+ | <%= l(:label_version) %> | +<%= l(:field_effective_date) %> | +<%= l(:field_description) %> | +<%= l(:field_status) %> | +<%= l(:field_sharing) %> | +<%= l(:label_wiki_page) %> | +|