jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

This commit is contained in:
whimlex 2015-04-17 14:29:33 +08:00
parent 0a97bbba9d 0ca96a5500
commit d35e5d649d
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/versions_controller.rb
View File

@ -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

6
app/helpers/members_helper.rb
View File

@ -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|

2
app/views/projects/settings.html.erb
View File

@ -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%>

2
app/views/projects/settings/_new_members.html.erb
View File

@ -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>

16
app/views/projects/settings/_new_versions.html.erb
View File

@ -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="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=""></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="w90"><%= l(:field_status) %></td>
<td class="w90"><%= l(:field_sharing) %></td>
<td class="w150"><%= l(:label_wiki_page) %></td>
<td class="w150"></td>
</tr>
<% for version in @project.shared_versions.sort %>
<tr class="pro_table_on">
@ -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>