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

Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject

This commit is contained in:
huang 2016-11-18 16:09:28 +08:00
parent 6584cd88f1 b8e59430e8
commit d48c2a36fc
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/issue.rb
View File

@ -853,7 +853,8 @@ class Issue < ActiveRecord::Base
def assignable_versions def assignable_versions
return @assignable_versions if @assignable_versions return @assignable_versions if @assignable_versions
versions = project.shared_versions.open.all # versions = project.shared_versions.open.all
versions = Version.where(:project_id => project.id, :status => "open").order("created_on desc")
if fixed_version if fixed_version
if fixed_version_id_changed? if fixed_version_id_changed?
# nothing to do # nothing to do
@ -865,7 +866,7 @@ class Issue < ActiveRecord::Base
versions << fixed_version versions << fixed_version
end end
end end
@assignable_versions = versions.uniq.sort @assignable_versions = versions.uniq
end end
# Returns true if this issue is blocked by another issue that is still open # Returns true if this issue is blocked by another issue that is still open

2
app/views/files/_project_list.html.erb
View File

@ -41,7 +41,7 @@
<%= render :partial => 'files/file_description', :locals => {:file => file} %> <%= render :partial => 'files/file_description', :locals => {:file => file} %>
</div> </div>
<%= form_tag(edit_file_description_project_file_path(file, :project_id => project.id),:remote=>'true', :method => :post, :id=>"files_query_form_#{file.id}") do %> <%= form_tag(edit_file_description_project_file_path(file, :project_id => project.id),:remote=>'true', :method => :post, :id=>"files_query_form_#{file.id}") do %>
<textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" name="file_description_edit" id="file_description_edit_<%= file.id %>" <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W800 none " placeholder="请编辑资源描述" name="file_description_edit" id="file_description_edit_<%= file.id %>"
onblur="commit_files_description('#files_query_form_<%= file.id %>','#file_description_edit_<%= file.id %>','#file_description_show_<%= file.id %>','#file_description_tip_<%= file.id %>');"><%= file.description %></textarea> onblur="commit_files_description('#files_query_form_<%= file.id %>','#file_description_edit_<%= file.id %>','#file_description_show_<%= file.id %>','#file_description_tip_<%= file.id %>');"><%= file.description %></textarea>
<% end %> <% end %>
</div> </div>

1
public/stylesheets/css/common.css
View File

@ -329,6 +329,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
.W600{ width:600px !important;} .W600{ width:600px !important;}
.W700{ width:700px; max-width:700px; min-width:700px;} .W700{ width:700px; max-width:700px; min-width:700px;}
.W710{ width:708px;} .W710{ width:708px;}
.W800{ width:800px !important;}
.maxwidth150{max-width: 150px;} .maxwidth150{max-width: 150px;}
.m_w460{max-width: 460px;} .m_w460{max-width: 460px;}
.m_w500{max-width: 500px;} .m_w500{max-width: 500px;}

1
public/stylesheets/project.css
View File

@ -1289,3 +1289,4 @@ a.pages-big{ width:50px;}
.W420 {width:420px;} .W420 {width:420px;}
.W300 {width:300px !important;} .W300 {width:300px !important;}
.W600{ width:600px;} .W600{ width:600px;}