Commit 7bded8f298764332f137f00c62ccf34b0dabff9d
1 parent
79f80705
Exists in
master
and in
1 other branch
renamed clear-issue to unlink-issue to be more descriptive as to what it does
Showing
3 changed files
with
9 additions
and
9 deletions
Show diff stats
app/controllers/errs_controller.rb
| @@ -44,7 +44,7 @@ class ErrsController < ApplicationController | @@ -44,7 +44,7 @@ class ErrsController < ApplicationController | ||
| 44 | redirect_to app_err_path(@app, @err) | 44 | redirect_to app_err_path(@app, @err) |
| 45 | end | 45 | end |
| 46 | 46 | ||
| 47 | - def clear_issue | 47 | + def unlink_issue |
| 48 | @err.update_attribute :issue_link, nil | 48 | @err.update_attribute :issue_link, nil |
| 49 | redirect_to app_err_path(@app, @err) | 49 | redirect_to app_err_path(@app, @err) |
| 50 | end | 50 | end |
app/views/errs/show.html.haml
| @@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
| 16 | %span= link_to 'create issue', create_issue_app_err_path(@app, @err), :method => :post, :class => "#{@app.issue_tracker.issue_tracker_type}_create create-issue" | 16 | %span= link_to 'create issue', create_issue_app_err_path(@app, @err), :method => :post, :class => "#{@app.issue_tracker.issue_tracker_type}_create create-issue" |
| 17 | - else | 17 | - else |
| 18 | %span= link_to 'go to issue', @err.issue_link, :class => "#{@app.issue_tracker.issue_tracker_type}_goto goto-issue" | 18 | %span= link_to 'go to issue', @err.issue_link, :class => "#{@app.issue_tracker.issue_tracker_type}_goto goto-issue" |
| 19 | - = link_to 'clear issue', clear_issue_app_err_path(@app, @err), :method => :delete, :confirm => "Clear err issues?", :class => "clear-issue" | 19 | + = link_to 'unlink issue', unlink_issue_app_err_path(@app, @err), :method => :delete, :confirm => "Unlink err issues?", :class => "unlink-issue" |
| 20 | - if @err.unresolved? | 20 | - if @err.unresolved? |
| 21 | %span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => err_confirm, :class => 'resolve' | 21 | %span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => err_confirm, :class => 'resolve' |
| 22 | 22 |
config/routes.rb
| 1 | Errbit::Application.routes.draw do | 1 | Errbit::Application.routes.draw do |
| 2 | - | 2 | + |
| 3 | devise_for :users | 3 | devise_for :users |
| 4 | 4 | ||
| 5 | # Hoptoad Notifier Routes | 5 | # Hoptoad Notifier Routes |
| 6 | match '/notifier_api/v2/notices' => 'notices#create' | 6 | match '/notifier_api/v2/notices' => 'notices#create' |
| 7 | match '/deploys.txt' => 'deploys#create' | 7 | match '/deploys.txt' => 'deploys#create' |
| 8 | - | 8 | + |
| 9 | resources :notices, :only => [:show] | 9 | resources :notices, :only => [:show] |
| 10 | resources :deploys, :only => [:show] | 10 | resources :deploys, :only => [:show] |
| 11 | resources :users | 11 | resources :users |
| @@ -14,22 +14,22 @@ Errbit::Application.routes.draw do | @@ -14,22 +14,22 @@ Errbit::Application.routes.draw do | ||
| 14 | get :all | 14 | get :all |
| 15 | end | 15 | end |
| 16 | end | 16 | end |
| 17 | - | 17 | + |
| 18 | resources :apps do | 18 | resources :apps do |
| 19 | resources :errs do | 19 | resources :errs do |
| 20 | resources :notices | 20 | resources :notices |
| 21 | member do | 21 | member do |
| 22 | put :resolve | 22 | put :resolve |
| 23 | post :create_issue | 23 | post :create_issue |
| 24 | - delete :clear_issue | 24 | + delete :unlink_issue |
| 25 | end | 25 | end |
| 26 | end | 26 | end |
| 27 | 27 | ||
| 28 | resources :deploys, :only => [:index] | 28 | resources :deploys, :only => [:index] |
| 29 | end | 29 | end |
| 30 | - | 30 | + |
| 31 | devise_for :users | 31 | devise_for :users |
| 32 | - | 32 | + |
| 33 | root :to => 'apps#index' | 33 | root :to => 'apps#index' |
| 34 | - | 34 | + |
| 35 | end | 35 | end |