diff options
| author | jessib <jessib@leap.se> | 2013-01-17 11:28:27 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-01-17 11:28:27 -0800 |
| commit | a4105f068e6f8ce89fbba475048f2a1e02e0fcbc (patch) | |
| tree | 91353015c71c5e2b73c416f1b6974423c1298632 /users/app/views/emails | |
| parent | dc16c6f8e5382f9e5470eb2a40081d41f4112437 (diff) | |
| parent | 6347fdbe0d932e78dfa8259bf81355edb19508e9 (diff) | |
Merge branch 'master' into feature/tickets_controllers_simplification
Conflicts:
users/app/controllers/users_controller.rb
Diffstat (limited to 'users/app/views/emails')
| -rw-r--r-- | users/app/views/emails/_email.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/users/app/views/emails/_email.html.haml b/users/app/views/emails/_email.html.haml index 3feb6f0..948d847 100644 --- a/users/app/views/emails/_email.html.haml +++ b/users/app/views/emails/_email.html.haml @@ -1,6 +1,7 @@ - if email.valid? %li.pull-right %code= email - = link_to(user_email_alias_path(@user, email), :method => :delete) do - %i.icon-remove + - if params[:action] == 'edit' + = link_to(user_email_alias_path(@user, email), :method => :delete) do + %i.icon-remove .clearfix |