From 68a86c5e5d2825b381ceb164b2cf943c3a0b24de Mon Sep 17 00:00:00 2001
From: zhanghaitao <562681745@qq.com>
Date: Thu, 7 Aug 2014 11:20:24 +0800
Subject: [PATCH] =?UTF-8?q?#873=20#829=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_attributes.html.erb         | 143 ++++++++++--------
 app/views/projects/_form.html.erb             |   5 +-
 .../projects/settings/_repositories.html.erb  |   8 +-
 app/views/repositories/_form.html.erb         |  66 ++++----
 app/views/repositories/new.html.erb           |  28 +++-
 5 files changed, 145 insertions(+), 105 deletions(-)

diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb
index f4857bd22..e44578243 100644
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@@ -1,63 +1,80 @@
-<%= labelled_fields_for :issue, @issue do |f| %>
-
-<fieldset class="collapsible collapsed" style="padding-left: 50px;">
-	<legend  onclick="toggleFieldset(this);" style="font-size:12px;"><strong><%= l(:label_change_properties) %></strong></legend>
-<div class="splitcontent" style="display: block;">
-<div class="splitcontentleft">
-<% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
-<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>
-
-<% else %>
-<p><label><%= l(:field_status) %></label> <%= h(@issue.status.name) %></p>
-<% end %>
-
-<% if @issue.safe_attribute? 'priority_id' %>
-<p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true}, :disabled => !@issue.leaf? %></p>
-<% end %>
-
-<% 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>
-<% end %>
-
-
-<% 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') %>
-<%= link_to(image_tag('add.png', :style => 'vertical-align: middle;'),
-            new_project_version_path(@issue.project),
-            :remote => true,
-            :method => 'get',
-            :title => l(:label_version_new),
-            :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
-</p>
-<% end %>
-</div>
-
-<div class="splitcontentright">
-
-<% 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>
-<% end %>
-
-<% 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>
-<% end %>
-
-<% 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>
-<% end %>
-
-<% 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') %></p>
-<% end %>
-</div>
-</div>
-</fieldset>
-
-<% if @issue.safe_attribute? 'custom_field_values' %>
-<%= render :partial => 'issues/form_custom_fields' %>
-<% end %>
-
-<% end %>
-
-<% include_calendar_headers_tags %>
+<%= labelled_fields_for :issue, @issue do |f| %>
+
+<fieldset class="collapsible collapsed" style="padding-left: 50px;">
+	<legend  onclick="toggleFieldset(this);" style="font-size:12px;"><strong><%= l(:label_change_properties) %></strong></legend>
+<div class="splitcontent" style="display: block;">
+<div class="splitcontentleft">
+<% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
+      <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>
+
+<% else %>
+   <p><label><%= l(:field_status) %></label> <%= h(@issue.status.name) %></p>
+<% end %>
+
+<% if @issue.safe_attribute? 'priority_id' %>
+<p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true}, :disabled => !@issue.leaf? %></p>
+<% end %>
+
+<% 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>
+<% end %>
+
+
+<% 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') %>
+<%= link_to(image_tag('add.png', :style => 'vertical-align: middle;'),
+            new_project_version_path(@issue.project),
+            :remote => true,
+            :method => 'get',
+            :title => l(:label_version_new),
+            :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
+</p>
+<% end %>
+</div>
+
+<div class="splitcontentright">
+
+<% 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>
+<% end %>
+
+<% 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>
+<% end %>
+
+<% 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>
+<% end %>
+  <script type="text/javascript">
+      function  PrecentChange(obj){
+          var _v=    obj;
+          if(_v==100)
+          {
+                //alert(3);
+          }
+          else if(_v==0)
+          {
+                //alert(1);
+          }
+          else if(_v!=100&&_v!=0)
+          {
+              // alert(2);
+          }
+      }
+  </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 %>
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index 47a87f441..7c84bf84b 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -8,10 +8,13 @@
 <p style="padding-right: 20px;">
   <%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %>
 </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? %>
   <em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em>
 <% 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;"><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>
diff --git a/app/views/projects/settings/_repositories.html.erb b/app/views/projects/settings/_repositories.html.erb
index bb42e7a54..4ad14bf84 100644
--- a/app/views/projects/settings/_repositories.html.erb
+++ b/app/views/projects/settings/_repositories.html.erb
@@ -15,7 +15,7 @@
   <% @project.repositories.sort.each do |repository| %>
     <tr class="<%= cycle 'odd', 'even' %>">
       <td>
-      <%= link_to repository.identifier, 
+      <%= link_to repository.identifier,
             {:controller => 'repositories', :action => 'show',:id => @project, :repository_id => repository.identifier_param} if repository.identifier.present? %>
       </td>
       <td align="center"><%= checked_image repository.is_default? %></td>
@@ -25,12 +25,12 @@
       <%else %>
       	<td><%=h repository.url %></td>
       <% end %>
-      
+
       <td class="buttons" style="text-align:left">
       	<% if repository.scm_name=="Subversion"%>
             <%if User.current.allowed_to?(:manage_repository, @project) %>
             	<%= 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),
              	:class => 'icon icon-edit') %>
             	 <%= delete_link repository_path(repository) %>
@@ -61,6 +61,6 @@
 <% end %>
 <!-- no repository  ，new  by xianbo-->
 <% 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>
 <% end %>
\ No newline at end of file
diff --git a/app/views/repositories/_form.html.erb b/app/views/repositories/_form.html.erb
index 7ecbb7ddb..b9a3a6c83 100644
--- a/app/views/repositories/_form.html.erb
+++ b/app/views/repositories/_form.html.erb
@@ -1,32 +1,34 @@
-<%= error_messages_for 'repository' %>
-
-<div class="box tabular">
-<p>
-<%= label_tag('repository_scm', l(:label_scm)) %>
-<!--Modified by tanxianbo-->
-<%= select_tag('repository_scm',
-               options_for_select(["Subversion"],@repository.class.name.demodulize),
-               :data => {:remote => true, :method => 'get'})%>
-<!--Ended by tanxianbo-->
-</p>
-
-<p><%= f.check_box :is_default, :label => :field_repository_is_default %></p>
-<p><%= f.text_field :identifier, :required => true, :disabled => @repository.identifier_frozen?  %>
-<% unless @repository.identifier_frozen? %>
-  <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') %>
-  <em class='info'><%= "#{l(:label_exist_repository_path)}" %></em>
-</p>
-<p><%= f.text_field :login, :size => 30 %></p>
-<p><%= f.password_field :password, :size => 30, :name => 'ignore', :value => ((@repository.new_record? || @repository.password.blank?) ? '' : ('x'*15)),
-                        :onfocus => "this.value=''; this.name='repository[password]';",
-                        :onchange => "this.name='repository[password]';" %></p>
-</div>
-<!--Ended by tanxianbo-->
-<p>
-  <%= submit_tag(@repository.new_record? ? l(:button_create) : l(:button_save)) %>
-	<%= link_to l(:button_cancel), settings_project_path(@project, :tab => 'repositories') %>
-</p>
+<%= error_messages_for 'repository' %>
+
+<div class="box tabular">
+<p>
+<%= label_tag('repository_scm', l(:label_scm)) %>
+<!--Modified by tanxianbo-->
+<%= select_tag('repository_scm',
+               options_for_select(["Subversion"],@repository.class.name.demodulize),
+               :data => {:remote => true, :method => 'get'})%>
+<!--Ended by tanxianbo-->
+</p>
+
+<p><%= f.check_box :is_default, :label => :field_repository_is_default %></p>
+<p style="display: none"><%= f.text_field :identifier, :required => true, :disabled => @repository.identifier_frozen?,
+                                          value:"#{User.current.id.to_s + '_' +format_time(Time.now).to_s}"%>
+<% unless @repository.identifier_frozen? %>
+  <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'), :id => "url_text_field" %>
+  <em class='info'><%= "#{l(:label_exist_repository_path)}" %></em>
+</p>
+<p><%= f.text_field :login, :size => 30 %></p>
+<p><%= f.password_field :password, :size => 30, :name => 'ignore', :value => ((@repository.new_record? || @repository.password.blank?) ? '' : ('x'*15)),
+                        :onfocus => "this.value=''; this.name='repository[password]';",
+                        :onchange => "this.name='repository[password]';" %></p>
+</div>
+<!--Ended by tanxianbo-->
+<p>
+  <%#= submit_tag(@repository.new_record? ? l(:button_create) : l(:button_save)) %>
+  <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>
diff --git a/app/views/repositories/new.html.erb b/app/views/repositories/new.html.erb
index 31a44a921..4127458b3 100644
--- a/app/views/repositories/new.html.erb
+++ b/app/views/repositories/new.html.erb
@@ -1,5 +1,23 @@
-<h3><%= l(:label_repository_new) %></h3>
-
-<%= labelled_form_for :repository, @repository, :url => project_repositories_path(@project), :html => {:id => 'repository-form'} do |f| %>
-  <%= render :partial => 'form', :locals => {:f => f} %>
-<% end %>
+<h3><%= l(:label_repository_new) %></h3>
+<script type="text/javascript">
+  //var re=new RegExp(strRegex);
+  function createVersion(){
+      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 %>