| @@ -175,7 +175,7 class IssuesController < ApplicationController | |||||
| 175 | @time_entry.attributes = params[:time_entry] |
|
175 | @time_entry.attributes = params[:time_entry] | |
| 176 | attachments = attach_files(@issue, params[:attachments]) |
|
176 | attachments = attach_files(@issue, params[:attachments]) | |
| 177 | attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)} |
|
177 | attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)} | |
| 178 | if @issue.save |
|
178 | if (@time_entry.hours.nil? || @time_entry.valid?) && @issue.save | |
| 179 | # Log spend time |
|
179 | # Log spend time | |
| 180 | if current_role.allowed_to?(:log_time) |
|
180 | if current_role.allowed_to?(:log_time) | |
| 181 | @time_entry.save |
|
181 | @time_entry.save | |
| @@ -4,6 +4,7 | |||||
| 4 | :class => nil, |
|
4 | :class => nil, | |
| 5 | :multipart => true} do |f| %> |
|
5 | :multipart => true} do |f| %> | |
| 6 | <%= error_messages_for 'issue' %> |
|
6 | <%= error_messages_for 'issue' %> | |
|
|
7 | <%= error_messages_for 'time_entry' %> | |||
| 7 | <div class="box"> |
|
8 | <div class="box"> | |
| 8 | <% if @edit_allowed || !@allowed_statuses.empty? %> |
|
9 | <% if @edit_allowed || !@allowed_statuses.empty? %> | |
| 9 | <fieldset class="tabular"><legend><%= l(:label_change_properties) %> |
|
10 | <fieldset class="tabular"><legend><%= l(:label_change_properties) %> | |
General Comments 0
You need to be logged in to leave comments.
Login now