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

#873 #829问题修改

This commit is contained in:
zhanghaitao 2014-08-07 11:20:24 +08:00
parent eacc0fdf53
commit 68a86c5e5d
5 changed files with 145 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
app/views/issues/_attributes.html.erb
View File

@ -1,63 +1,80 @@
<%= labelled_fields_for :issue, @issue do |f| %> <%= labelled_fields_for :issue, @issue do |f| %>
<fieldset class="collapsible collapsed" style="padding-left: 50px;"> <fieldset class="collapsible collapsed" style="padding-left: 50px;">
<legend onclick="toggleFieldset(this);" style="font-size:12px;"><strong><%= l(:label_change_properties) %></strong></legend> <legend onclick="toggleFieldset(this);" style="font-size:12px;"><strong><%= l(:label_change_properties) %></strong></legend>
<div class="splitcontent" style="display: block;"> <div class="splitcontent" style="display: block;">
<div class="splitcontentleft"> <div class="splitcontentleft">
<% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %> <% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
<p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), {:required => true}, <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), {:required => true}, :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')" %></p>
:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')" %></p>
<% else %>
<% else %> <p><label><%= l(:field_status) %></label> <%= h(@issue.status.name) %></p>
<p><label><%= l(:field_status) %></label> <%= h(@issue.status.name) %></p> <% end %>
<% end %>
<% if @issue.safe_attribute? 'priority_id' %>
<% if @issue.safe_attribute? 'priority_id' %> <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true}, :disabled => !@issue.leaf? %></p>
<p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true}, :disabled => !@issue.leaf? %></p> <% end %>
<% end %>
<% if @issue.safe_attribute? 'assigned_to_id' %>
<% if @issue.safe_attribute? 'assigned_to_id' %> <p><%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), :include_blank => true, :required => @issue.required_attribute?('assigned_to_id') %></p>
<p><%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), :include_blank => true, :required => @issue.required_attribute?('assigned_to_id') %></p> <% end %>
<% end %>
<% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %>
<% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %> <p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true, :required => @issue.required_attribute?('fixed_version_id') %>
<p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true, :required => @issue.required_attribute?('fixed_version_id') %> <%= link_to(image_tag('add.png', :style => 'vertical-align: middle;'),
<%= link_to(image_tag('add.png', :style => 'vertical-align: middle;'), new_project_version_path(@issue.project),
new_project_version_path(@issue.project), :remote => true,
:remote => true, :method => 'get',
:method => 'get', :title => l(:label_version_new),
:title => l(:label_version_new), :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
:tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %> </p>
</p> <% end %>
<% end %> </div>
</div>
<div class="splitcontentright">
<div class="splitcontentright">
<% if @issue.safe_attribute? 'start_date' %>
<% if @issue.safe_attribute? 'start_date' %> <p><%= f.text_field :start_date, :size => 10, :disabled => !@issue.leaf?, :required => @issue.required_attribute?('start_date') %><%= calendar_for('issue_start_date') if @issue.leaf? %></p>
<p><%= f.text_field :start_date, :size => 10, :disabled => !@issue.leaf?, :required => @issue.required_attribute?('start_date') %><%= calendar_for('issue_start_date') if @issue.leaf? %></p> <% end %>
<% end %>
<% if @issue.safe_attribute? 'due_date' %>
<% if @issue.safe_attribute? 'due_date' %> <p><%= f.text_field :due_date, :size => 10, :disabled => !@issue.leaf?, :required => @issue.required_attribute?('due_date') %><%= calendar_for('issue_due_date') if @issue.leaf? %></p>
<p><%= f.text_field :due_date, :size => 10, :disabled => !@issue.leaf?, :required => @issue.required_attribute?('due_date') %><%= calendar_for('issue_due_date') if @issue.leaf? %></p> <% end %>
<% end %>
<% if @issue.safe_attribute? 'estimated_hours' %>
<% if @issue.safe_attribute? 'estimated_hours' %> <p><%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf?, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %></p>
<p><%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf?, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %></p> <% end %>
<% end %> <script type="text/javascript">
function PrecentChange(obj){
<% if @issue.safe_attribute?('done_ratio') && @issue.leaf? && Issue.use_field_for_done_ratio? %> var _v= obj;
<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :required => @issue.required_attribute?('done_ratio') %></p> if(_v==100)
<% end %> {
</div> //alert(3);
</div> }
</fieldset> else if(_v==0)
{
<% if @issue.safe_attribute? 'custom_field_values' %> //alert(1);
<%= render :partial => 'issues/form_custom_fields' %> }
<% end %> else if(_v!=100&&_v!=0)
{
<% end %> // alert(2);
}
<% include_calendar_headers_tags %> }
</script>
<% if @issue.safe_attribute?('done_ratio') && @issue.leaf? && Issue.use_field_for_done_ratio? %>
<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), {:required => @issue.required_attribute?('done_ratio')},
{:onchange => "PrecentChange(this.value)"} %></p>
<% end %>
</div>
</div>
</fieldset>
<% if @issue.safe_attribute? 'custom_field_values' %>
<%= render :partial => 'issues/form_custom_fields' %>
<% end %>
<% end %>
<% include_calendar_headers_tags %>

5
app/views/projects/_form.html.erb
View File

@ -8,10 +8,13 @@
<p style="padding-right: 20px;"> <p style="padding-right: 20px;">
<%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %> <%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %>
</p><!--by young--> </p><!--by young-->
<p><%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH %>
<p style="display: none"><%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH,
value:"#{User.current.id.to_s + '_' +format_time(Time.now).to_s}" %>
<% unless @project.identifier_frozen? %> <% unless @project.identifier_frozen? %>
<em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em> <em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em>
<% end %></p> <% end %></p>
<!-- <p style="margin-left:-10px;"><%#= f.text_field :homepage, :size => 60, :style => "width:488px;margin-left: 10px;" %></p> --> <!-- by huang --> <!-- <p style="margin-left:-10px;"><%#= f.text_field :homepage, :size => 60, :style => "width:488px;margin-left: 10px;" %></p> --> <!-- by huang -->
<p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.check_box :is_public, :style => "margin-left:10px;" %></em></p> <p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.check_box :is_public, :style => "margin-left:10px;" %></em></p>
<p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.check_box :hidden_repo, :style => "margin-left:10px;" %></em></p> <p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.check_box :hidden_repo, :style => "margin-left:10px;" %></em></p>

8
app/views/projects/settings/_repositories.html.erb
View File

@ -15,7 +15,7 @@
<% @project.repositories.sort.each do |repository| %> <% @project.repositories.sort.each do |repository| %>
<tr class="<%= cycle 'odd', 'even' %>"> <tr class="<%= cycle 'odd', 'even' %>">
<td> <td>
<%= link_to repository.identifier, <%= link_to repository.identifier,
{:controller => 'repositories', :action => 'show',:id => @project, :repository_id => repository.identifier_param} if repository.identifier.present? %> {:controller => 'repositories', :action => 'show',:id => @project, :repository_id => repository.identifier_param} if repository.identifier.present? %>
</td> </td>
<td align="center"><%= checked_image repository.is_default? %></td> <td align="center"><%= checked_image repository.is_default? %></td>
@ -25,12 +25,12 @@
<%else %> <%else %>
<td><%=h repository.url %></td> <td><%=h repository.url %></td>
<% end %> <% end %>
<td class="buttons" style="text-align:left"> <td class="buttons" style="text-align:left">
<% if repository.scm_name=="Subversion"%> <% if repository.scm_name=="Subversion"%>
<%if User.current.allowed_to?(:manage_repository, @project) %> <%if User.current.allowed_to?(:manage_repository, @project) %>
<%= link_to(l(:label_user_plural), committers_repository_path(repository), <%= link_to(l(:label_user_plural), committers_repository_path(repository),
:class => 'icon icon-user') %> :class => 'icon icon-user') %>
<%= link_to(l(:button_edit), edit_repository_path(repository), <%= link_to(l(:button_edit), edit_repository_path(repository),
:class => 'icon icon-edit') %> :class => 'icon icon-edit') %>
<%= delete_link repository_path(repository) %> <%= delete_link repository_path(repository) %>
@ -61,6 +61,6 @@
<% end %> <% end %>
<!-- no repository ，new by xianbo--> <!-- no repository ，new by xianbo-->
<% if User.current.allowed_to?(:manage_repository, @project) %> <% if User.current.allowed_to?(:manage_repository, @project) %>
<p><%= l(:label_repository_no) %> <p><%= l(:label_repository_no) %>
<%= link_to l(:label_repository_new_repos), newrepo_project_repository_path(@project, :course => course_tag), :class => 'icon icon-add' %></p> <%= link_to l(:label_repository_new_repos), newrepo_project_repository_path(@project, :course => course_tag), :class => 'icon icon-add' %></p>
<% end %> <% end %>

66
app/views/repositories/_form.html.erb
View File

@ -1,32 +1,34 @@
<%= error_messages_for 'repository' %> <%= error_messages_for 'repository' %>
<div class="box tabular"> <div class="box tabular">
<p> <p>
<%= label_tag('repository_scm', l(:label_scm)) %> <%= label_tag('repository_scm', l(:label_scm)) %>
<!--Modified by tanxianbo--> <!--Modified by tanxianbo-->
<%= select_tag('repository_scm', <%= select_tag('repository_scm',
options_for_select(["Subversion"],@repository.class.name.demodulize), options_for_select(["Subversion"],@repository.class.name.demodulize),
:data => {:remote => true, :method => 'get'})%> :data => {:remote => true, :method => 'get'})%>
<!--Ended by tanxianbo--> <!--Ended by tanxianbo-->
</p> </p>
<p><%= f.check_box :is_default, :label => :field_repository_is_default %></p> <p><%= f.check_box :is_default, :label => :field_repository_is_default %></p>
<p><%= f.text_field :identifier, :required => true, :disabled => @repository.identifier_frozen? %> <p style="display: none"><%= f.text_field :identifier, :required => true, :disabled => @repository.identifier_frozen?,
<% unless @repository.identifier_frozen? %> value:"#{User.current.id.to_s + '_' +format_time(Time.now).to_s}"%>
<em class="info"><%= l(:text_length_between, :min => 1, :max => Repository::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_repository_identifier_info).html_safe %></em> <% unless @repository.identifier_frozen? %>
<% end %></p> <em class="info" ><%= l(:text_length_between, :min => 1, :max => Repository::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_repository_identifier_info).html_safe %></em>
<% end %></p>
<!--Modified by tanxianbo-->
<p><%= f.text_field :url, :size => 60, :required => true, :disabled => !@repository.safe_attribute?('url') %> <!--Modified by tanxianbo-->
<em class='info'><%= "#{l(:label_exist_repository_path)}" %></em> <p><%= f.text_field :url, :size => 60, :required => true, :disabled => !@repository.safe_attribute?('url'), :id => "url_text_field" %>
</p> <em class='info'><%= "#{l(:label_exist_repository_path)}" %></em>
<p><%= f.text_field :login, :size => 30 %></p> </p>
<p><%= f.password_field :password, :size => 30, :name => 'ignore', :value => ((@repository.new_record? || @repository.password.blank?) ? '' : ('x'*15)), <p><%= f.text_field :login, :size => 30 %></p>
:onfocus => "this.value=''; this.name='repository[password]';", <p><%= f.password_field :password, :size => 30, :name => 'ignore', :value => ((@repository.new_record? || @repository.password.blank?) ? '' : ('x'*15)),
:onchange => "this.name='repository[password]';" %></p> :onfocus => "this.value=''; this.name='repository[password]';",
</div> :onchange => "this.name='repository[password]';" %></p>
<!--Ended by tanxianbo--> </div>
<p> <!--Ended by tanxianbo-->
<%= submit_tag(@repository.new_record? ? l(:button_create) : l(:button_save)) %> <p>
<%= link_to l(:button_cancel), settings_project_path(@project, :tab => 'repositories') %> <%#= submit_tag(@repository.new_record? ? l(:button_create) : l(:button_save)) %>
</p> <input type="button" class="enterprise" value="<%= @repository.new_record? ? l(:button_create) : l(:button_save) %>" onclick="createVersion();"/>
<%= link_to l(:button_cancel), settings_project_path(@project, :tab => 'repositories') %>
</p>

28
app/views/repositories/new.html.erb
View File

@ -1,5 +1,23 @@
<h3><%= l(:label_repository_new) %></h3> <h3><%= l(:label_repository_new) %></h3>
<script type="text/javascript">
<%= labelled_form_for :repository, @repository, :url => project_repositories_path(@project), :html => {:id => 'repository-form'} do |f| %> //var re=new RegExp(strRegex);
<%= render :partial => 'form', :locals => {:f => f} %> function createVersion(){
<% end %> var re =new RegExp("^(https|http|file|svn)[?:]{1}/{1}/{1}.*$");
var strRegex = /^([https|http|file|svn]:){1}.*$/;
var name = $("#url_text_field").val();
if(name == "")
{
alert("URL不能为空");
return;
}
else if(!re.test(name))
{
alert("URL路径不正确");
return;
}
$("#repository-form").submit();
}
</script>
<%= labelled_form_for :repository, @repository, :url => project_repositories_path(@project), :html => {:id => 'repository-form'} do |f| %>
<%= render :partial => 'form', :locals => {:f => f} %>
<% end %>