diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index 36ce47d9e..2389284b8 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -116,7 +116,8 @@ class VersionsController < ApplicationController end else respond_to do |format| - format.html { render :action => 'new' } + format.html { flash[:error] = @version.errors.full_messages.to_s + redirect_to settings_project_url(@project, :tab => 'versions') } format.js { render :action => 'new' } format.api { render_validation_errors(@version) } end diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb index d8b53acd0..9a65556d8 100644 --- a/app/views/attachments/_project_file_links.html.erb +++ b/app/views/attachments/_project_file_links.html.erb @@ -59,12 +59,14 @@ <% end %>

<% end %> +
<% if defined?(thumbnails) && thumbnails %> <% images = attachments.select(&:thumbnailable?) %> <% if images.any? %> <% images.each do |attachment| %> -
<%= thumbnail_issue_tag(attachment) %>
+
<%= thumbnail_issue_tag(attachment) %>
<% end %> <% end %> <% end %> +
diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index 4ce029217..68bd9f82c 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -9,7 +9,8 @@ <%= f.select :status_id, (@allowed_statuses.collect { |p| [p.name, p.id] }), {:no_label => true}, - :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')", + # ajax 刷新 + #:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')", :class => "w150" %> <% else %> <%= h(@issue.status.name) %> diff --git a/app/views/issues/update_form.js.erb b/app/views/issues/update_form.js.erb index 615bbfcb3..cc4fb18fc 100644 --- a/app/views/issues/update_form.js.erb +++ b/app/views/issues/update_form.js.erb @@ -1,5 +1,5 @@ $('#all_attributes').html('<%= escape_javascript(render :partial => 'form') %>'); -$(.splitcontent).style("display", "block") +//$(.splitcontent).style("display", "block") <% if User.current.allowed_to?(:log_time, @issue.project) %> $('#log_time').show(); <% else %> diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb index 6fe71d7c3..d3499cfdd 100644 --- a/app/views/projects/settings.html.erb +++ b/app/views/projects/settings.html.erb @@ -5,8 +5,10 @@ project_setting(2); <% elsif @select_tab == "versions"%> project_setting(4); + $("#pro_st_edit_ban").toggle(); <% elsif @select_tab == "repositories" %> project_setting(6); + $("#pro_st_edit_ku").toggle(); <%else%> <% end%> diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb index ffc301cf5..74d4df53b 100644 --- a/app/views/projects/settings/_new_versions.html.erb +++ b/app/views/projects/settings/_new_versions.html.erb @@ -11,10 +11,10 @@ <%= l(:label_version) %> <%= l(:field_effective_date) %> - <%= l(:field_description) %> + <%= l(:field_description) %> <%= l(:field_status) %> <%= l(:field_sharing) %> - <%= l(:label_wiki_page) %> + <%= l(:label_wiki_page) %> <% for version in @project.shared_versions.sort %> @@ -58,7 +58,7 @@