diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index b2eb6fd0e..188481cb2 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -268,13 +268,14 @@ module ProjectsHelper
grouped = Hash.new {|h,k| h[k] = []}
grouped[project_name] << ["请选择里程碑", 0]
+=begin
unless selected.nil?
if (params[:action] == "show" ) && Version.find(selected.id).status == "closed"
version_name = Version.find(selected.id).name
grouped[project_name] << [version_name, selected.id]
end
end
-
+=end
versions.each do |version|
grouped[version.project.name] << [version.name, version.id]
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 1b47d80cc..46a42cb34 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -854,7 +854,8 @@ class Issue < ActiveRecord::Base
return @assignable_versions if @assignable_versions
# versions = project.shared_versions.open.all
- versions = Version.where(:project_id => project.id, :status => "open").order("created_on desc")
+ # versions = Version.where(:project_id => project.id, :status => "open").order("created_on desc")
+ versions = Version.where(:project_id => project.id).order("created_on desc")
if fixed_version
if fixed_version_id_changed?
# nothing to do
diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 13bde48a5..94b55f3e2 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -98,8 +98,8 @@
<% if @issue.safe_attribute? 'start_date' %>
<%= f.text_field :start_date, :size => 22, :disabled => !@issue.leaf?, :no_label => true,
- :required => @issue.required_attribute?('start_date'), :onchange=>"issue_start_date_change();",
- :class=>"fl calendar_input", :style=>"width:170px;" %>
+ :required => @issue.required_attribute?('start_date'), :onchange => "issue_start_date_change();",
+ :class => "fl calendar_input", :style => "width:170px;" %>
<%= calendar_for('issue_start_date', 'start_date') if @issue.leaf? %>
<% end %>
@@ -110,8 +110,8 @@
<% if @issue.safe_attribute? 'due_date' %>
<%= f.text_field :due_date, :size => 22, :disabled => !@issue.leaf?, :no_label => true,
- :required => @issue.required_attribute?('due_date'), :onchange=>"issue_end_date_change();",
- :class=>"fl calendar_input",:style=>"width: 170px;", :placeholder=> "请选择结束日期" %>
+ :required => @issue.required_attribute?('due_date'), :onchange => "issue_end_date_change();",
+ :class => "fl calendar_input",:style => "width: 170px;", :placeholder => "请选择结束日期" %>
<%= calendar_for('issue_due_date', 'start_date') if @issue.leaf? %>
<% end %>
@@ -121,7 +121,7 @@
<% if @issue.safe_attribute? 'estimated_hours' %>
<%= f.text_field :estimated_hours, :size => 22, :disabled => !@issue.leaf?, :no_label => true,
- :required => @issue.required_attribute?('estimated_hours'), :placeholder=> "请填写预计工时" %>
+ :required => @issue.required_attribute?('estimated_hours'), :placeholder => "请填写预计工时" %>
<% end %>
<%= l(:field_estimated_hours) %>