kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not silently ignore timelog validation failure on issue edit.

Browse Source 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1603 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2008-06-29 12:16:58 +00:00
parent 1424b0f215
commit 32fa1a4e90
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/issues_controller.rb
View File

@ -175,7 +175,7 @@ class IssuesController < ApplicationController
@time_entry.attributes = params[:time_entry] @time_entry.attributes = params[:time_entry]
attachments = attach_files(@issue, params[:attachments]) attachments = attach_files(@issue, params[:attachments])
attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)} attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
if @issue.save if (@time_entry.hours.nil? || @time_entry.valid?) && @issue.save
# Log spend time # Log spend time
if current_role.allowed_to?(:log_time) if current_role.allowed_to?(:log_time)
@time_entry.save @time_entry.save

1
app/views/issues/_edit.rhtml
View File

@ -4,6 +4,7 @@
:class => nil, :class => nil,
:multipart => true} do |f| %> :multipart => true} do |f| %>
<%= error_messages_for 'issue' %> <%= error_messages_for 'issue' %>
<%= error_messages_for 'time_entry' %>
<div class="box"> <div class="box">
<% if @edit_allowed || !@allowed_statuses.empty? %> <% if @edit_allowed || !@allowed_statuses.empty? %>
<fieldset class="tabular"><legend><%= l(:label_change_properties) %> <fieldset class="tabular"><legend><%= l(:label_change_properties) %>