diff options
| author | Etienne Massip <etienne.massip@gmail.com> | 2011-12-14 19:20:19 +0000 |
|---|---|---|
| committer | Etienne Massip <etienne.massip@gmail.com> | 2011-12-14 19:20:19 +0000 |
| commit | befb5081f400e81c9ceb8e0adb49fbe67b33361e (patch) | |
| tree | 22fa2004f30e76464718476619abe5c5b6785930 /app/views/context_menus | |
| parent | 8eaa63ccbf5be97a3e588e57a038cd289122165d (diff) | |
| download | redmine-befb5081f400e81c9ceb8e0adb49fbe67b33361e.tar.gz redmine-befb5081f400e81c9ceb8e0adb49fbe67b33361e.zip | |
Fixed time entries context menu activity update link.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8208 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/context_menus')
| -rw-r--r-- | app/views/context_menus/time_entries.html.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/context_menus/time_entries.html.erb b/app/views/context_menus/time_entries.html.erb index 260e1180e..43e31145e 100644 --- a/app/views/context_menus/time_entries.html.erb +++ b/app/views/context_menus/time_entries.html.erb @@ -14,10 +14,10 @@ <a href="#" class="submenu"><%= l(:field_activity) %></a> <ul> <% @activities.each do |u| -%> - <li><%= context_menu_link h(u.name), {:controller => 'timelog', :action => 'bulk_edit', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => u}, :back_url => @back}, :method => :post, + <li><%= context_menu_link h(u.name), {:controller => 'timelog', :action => 'bulk_update', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => u}, :back_url => @back}, :method => :post, :selected => (@time_entry && u == @time_entry.activity), :disabled => !@can[:edit] %></li> <% end -%> - <li><%= context_menu_link l(:label_none), {:controller => 'timelog', :action => 'bulk_edit', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => 'none'}, :back_url => @back}, :method => :post, + <li><%= context_menu_link l(:label_none), {:controller => 'timelog', :action => 'bulk_update', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => 'none'}, :back_url => @back}, :method => :post, :selected => (@time_entry && @time_entry.activity.nil?), :disabled => !@can[:edit] %></li> </ul> </li> |