From 7bded8f298764332f137f00c62ccf34b0dabff9d Mon Sep 17 00:00:00 2001 From: Tracey Eubanks Date: Thu, 21 Jul 2011 08:14:07 -0600 Subject: [PATCH] renamed clear-issue to unlink-issue to be more descriptive as to what it does --- app/controllers/errs_controller.rb | 2 +- app/views/errs/show.html.haml | 2 +- config/routes.rb | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/errs_controller.rb b/app/controllers/errs_controller.rb index c1ec811..849d649 100644 --- a/app/controllers/errs_controller.rb +++ b/app/controllers/errs_controller.rb @@ -44,7 +44,7 @@ class ErrsController < ApplicationController redirect_to app_err_path(@app, @err) end - def clear_issue + def unlink_issue @err.update_attribute :issue_link, nil redirect_to app_err_path(@app, @err) end diff --git a/app/views/errs/show.html.haml b/app/views/errs/show.html.haml index 32cdb27..673bd50 100644 --- a/app/views/errs/show.html.haml +++ b/app/views/errs/show.html.haml @@ -16,7 +16,7 @@ %span= link_to 'create issue', create_issue_app_err_path(@app, @err), :method => :post, :class => "#{@app.issue_tracker.issue_tracker_type}_create create-issue" - else %span= link_to 'go to issue', @err.issue_link, :class => "#{@app.issue_tracker.issue_tracker_type}_goto goto-issue" - = link_to 'clear issue', clear_issue_app_err_path(@app, @err), :method => :delete, :confirm => "Clear err issues?", :class => "clear-issue" + = link_to 'unlink issue', unlink_issue_app_err_path(@app, @err), :method => :delete, :confirm => "Unlink err issues?", :class => "unlink-issue" - if @err.unresolved? %span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => err_confirm, :class => 'resolve' diff --git a/config/routes.rb b/config/routes.rb index 63dbd20..6cc4244 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,11 +1,11 @@ Errbit::Application.routes.draw do - + devise_for :users # Hoptoad Notifier Routes match '/notifier_api/v2/notices' => 'notices#create' match '/deploys.txt' => 'deploys#create' - + resources :notices, :only => [:show] resources :deploys, :only => [:show] resources :users @@ -14,22 +14,22 @@ Errbit::Application.routes.draw do get :all end end - + resources :apps do resources :errs do resources :notices member do put :resolve post :create_issue - delete :clear_issue + delete :unlink_issue end end resources :deploys, :only => [:index] end - + devise_for :users - + root :to => 'apps#index' - + end -- libgit2 0.21.2