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

app/views/projects/_form.html.erb

@@ -10,7 +10,7 @@
 </p><!--by young-->
 
 <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}" %>
+                                          value:"#{User.current.id.to_s + '_' +Time.now.to_s.gsub(' ','_').gsub(':','').gsub('+','')}" %>
 <% 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>

app/views/repositories/_form.html.erb

@@ -12,7 +12,7 @@
 
 <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}"%>
+                                          value:"#{User.current.id.to_s + '_' +Time.now.to_s.gsub(' ','_').gsub(':','').gsub('+','')}"%>
 <% 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>