diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2009-10-21 22:34:28 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2009-10-21 22:34:28 +0000 |
| commit | e76d4c5c4c3f2beb8be1f441148e4627a14d37d1 (patch) | |
| tree | 8f1ea0620882ad97d3804018d109f8a35f1ed4a0 /app/views/timelog | |
| parent | ac4937a76755de2f9b6a83f6160efa0fde2d03aa (diff) | |
| download | redmine-e76d4c5c4c3f2beb8be1f441148e4627a14d37d1.tar.gz redmine-e76d4c5c4c3f2beb8be1f441148e4627a14d37d1.zip | |
Added an active field track if an Enumeration is active on the frontend view.
* Changed TimelogHelper#activity_collection_for_select_options to only use
active TimeEntryActivities.
* Changed TimelogHelper#activity_collection_for_select_options to return a blank
option if the time_entry's current activity is inactive.
#4077
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2946 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/timelog')
| -rw-r--r-- | app/views/timelog/edit.rhtml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/timelog/edit.rhtml b/app/views/timelog/edit.rhtml index a0ff860f8..00d0a77c0 100644 --- a/app/views/timelog/edit.rhtml +++ b/app/views/timelog/edit.rhtml @@ -9,7 +9,7 @@ <p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p> <p><%= f.text_field :hours, :size => 6, :required => true %></p> <p><%= f.text_field :comments, :size => 100 %></p> -<p><%= f.select :activity_id, activity_collection_for_select_options, :required => true %></p> +<p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p> <% @time_entry.custom_field_values.each do |value| %> <p><%= custom_field_tag_with_label :time_entry, value %></p> <% end %> |