jro_apps/redmine Commit - r9229:18270ee5879b

Code cleanup....

Jean-Philippe Lang -

r9229:18270ee5879b

parent child

Context file:

r9229:18270ee5879b

app/controllers/application_controller.rb +13 0

                  false
                end
+               # Redirects to the request referer if present, redirects to args or call block otherwise.
+               def redirect_to_referer_or(*args, &block)
+                 redirect_to :back
+               rescue ::ActionController::RedirectBackError
+                 if args.any?
+                   redirect_to *args
+                 elsif block_given?
+                   block.call
+                 else
+                   raise "#redirect_to_referer_or takes arguments or a block"
+                 end
+               end
                def render_403(options={})
                  @project = nil
                  render_error({:message => :notice_not_authorized, :status => 403}.merge(options))

app/controllers/attachments_controller.rb +1 -3

                  end
                  # Make sure association callbacks are called
                  @attachment.container.attachments.delete(@attachment)
-                 redirect_to :back
-               rescue ::ActionController::RedirectBackError
-                 redirect_to :controller => 'projects', :action => 'show', :id => @project
+                 redirect_back_or_default project_path(@project)
                end
              private

app/controllers/users_controller.rb +1 -3

                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_update)
-                       redirect_to :back
+                       redirect_to_referer_or edit_user_path(@user)
                      }
                      format.api  { head :ok }
                    end
                      format.api  { render_validation_errors(@user) }
                    end
                  end
-               rescue ::ActionController::RedirectBackError
-                 redirect_to :controller => 'users', :action => 'edit', :id => @user
                end
                def destroy

app/controllers/watchers_controller.rb +2 -6

                    end
                  end
                  respond_to do |format|
-                   format.html { redirect_to :back }
+                   format.html { redirect_to_referer_or {render :text => 'Watcher added.', :layout => true}}
                    format.js do
                      render :update do |page|
                        page.replace_html 'ajax-modal', :partial => 'watchers/new', :locals => {:watched => @watched}
                      end
                    end
                  end
-               rescue ::ActionController::RedirectBackError
-                 render :text => 'Watcher added.', :layout => true
                end
                def append
                def set_watcher(user, watching)
                  @watched.set_watcher(user, watching)
                  respond_to do |format|
-                   format.html { redirect_to :back }
+                   format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
                    format.js do
                      render(:update) do |page|
                        c = watcher_css(@watched)
                      end
                    end
                  end
-               rescue ::ActionController::RedirectBackError
-                 render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true
                end
              end

General Comments 0

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

No TODOs yet

	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