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 %> +<%= "@ #{h rev_text}" unless rev_text.blank? %>
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 1658339ec..0c52ac4a3 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -534,3 +534,13 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; } /*pre标签换行*/ .break_word{word-break: break-all;word-wrap: break-word;} .break_word_firefox{white-space: pre-wrap;word-break: break-all;} + +/*问题跟踪attachment显示*/ +div.attachments { margin-top: 12px; } +div.attachments p { margin:4px 0 2px 0; } +div.attachments img { vertical-align: middle; } +div.attachments span.author { font-size: 0.9em; color: #888; } + +div.thumbnails {margin-top:0.6em;} +div.thumbnails div {background:#fff;display:inline-block;margin-right:2px;} +