jro_apps/redmine Commit - r5196:098fabd6ce4c

add function of bulk delete time entries (#7996)....

Toshi MARUYAMA -

r5196:098fabd6ce4c

parent child

Context file:

r5196:098fabd6ce4c

Collapse all files

app/controllers/timelog_controller.rb +24 -20

              class TimelogController < ApplicationController
                menu_item :issues
                before_filter :find_project, :only => [:new, :create]
-               before_filter :find_time_entry, :only => [:show, :edit, :update, :destroy]
-               before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update]
+               before_filter :find_time_entry, :only => [:show, :edit, :update]
+               before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy]
                before_filter :authorize, :except => [:index]
                before_filter :find_optional_project, :only => [:index]
                accept_key_auth :index, :show, :create, :update, :destroy
                    end
                  end
                  set_flash_from_bulk_time_entry_save(@time_entries, unsaved_time_entry_ids)
-                 redirect_back_or_default({:controller => 'timelog', :action => 'index', :project_id => @project})
+                 redirect_back_or_default({:controller => 'timelog', :action => 'index', :project_id => @projects.first})
                end
                verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed }
                def destroy
-                 if @time_entry.destroy && @time_entry.destroyed?
-                   respond_to do |format|
-                     format.html {
-                       flash[:notice] = l(:notice_successful_delete)
-                       redirect_to :back
+                     }
-                     format.api  { head :ok }
-                   end
-                 else
-                   respond_to do |format|
-                     format.html {
-                       flash[:error] = l(:notice_unable_delete_time_entry)
-                       redirect_to :back
+                     }
-                     format.api  { render_validation_errors(@time_entry) }
+                 @time_entries.each do |t|
+                   begin
+                     unless t.destroy && t.destroyed?
+                       respond_to do |format|
+                         format.html {
+                           flash[:error] = l(:notice_unable_delete_time_entry)
+                           redirect_to :back
+                         }
+                         format.api  { render_validation_errors(t) }
+                       end
+                     end
+                   rescue ::ActionController::RedirectBackError
+                     redirect_to :action => 'index', :project_id => @projects.first
                    end
                  end
-               rescue ::ActionController::RedirectBackError
-                 redirect_to :action => 'index', :project_id => @time_entry.project
+                 respond_to do |format|
+                   format.html {
+                     flash[:notice] = l(:notice_successful_delete)
+                     redirect_back_or_default(:action => 'index', :project_id => @projects.first)
+                   }
+                   format.api  { head :ok }
+                 end
                end
              private

app/views/context_menus/time_entries.html.erb +6 0

              	<% end %>
                <%= call_hook(:view_time_entries_context_menu_end, {:time_entries => @time_entries, :can => @can, :back => @back }) %>
+               <li>
+                 <%= context_menu_link l(:button_delete),
+                   {:controller => 'timelog', :action => 'destroy', :ids => @time_entries.collect(&:id), :back_url => @back},
+                   :method => :delete, :confirm => l(:text_time_entries_destroy_confirmation), :class => 'icon-del', :disabled => !@can[:delete] %>
+               </li>
              </ul>

config/locales/en.yml +1 0

                text_status_changed_by_changeset: "Applied in changeset %{value}."
                text_time_logged_by_changeset: "Applied in changeset %{value}."
                text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s)?'
+               text_time_entries_destroy_confirmation: 'Are you sure you want to delete the selected time entr(y/ies)?'
                text_select_project_modules: 'Select modules to enable for this project:'
                text_default_administrator_account_changed: Default administrator account changed
                text_file_repository_writable: Attachments directory writable

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages