From e85daa405baa232db0650a66f6f8b9aee1d5446c Mon Sep 17 00:00:00 2001 From: Logan Gingerich Date: Thu, 16 Nov 2017 09:36:22 -0700 Subject: [PATCH] Moved add photo button from garden show view to garden actions --- app/views/gardens/_actions.html.haml | 5 +++++ app/views/gardens/show.html.haml | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/views/gardens/_actions.html.haml b/app/views/gardens/_actions.html.haml index 4d262f97c..5aec0ba35 100644 --- a/app/views/gardens/_actions.html.haml +++ b/app/views/gardens/_actions.html.haml @@ -21,3 +21,8 @@ class: 'btn btn-default', id: 'delete_garden_link' do %span.glyphicon.glyphicon-trash{ title: "Delete" } Delete + - if can?(:edit, @garden) && can?(:create, Photo) + = link_to new_photo_path(type: "garden", id: @garden.id), + class: 'btn btn-primary' do + %span.glyphicon.glyphicon-camera{ title: "Add Photo" } + Add Photo diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml index cdfedeb13..ef5b41cfb 100644 --- a/app/views/gardens/show.html.haml +++ b/app/views/gardens/show.html.haml @@ -12,12 +12,6 @@ .row .col-md-9 %p.btn-group= render 'gardens/actions', garden: @garden - - if can?(:edit, @garden) && can?(:create, Photo) - %p - = link_to new_photo_path(type: "garden", id: @garden.id), - class: 'btn btn-primary' do - %span.glyphicon.glyphicon-camera{ title: "Add Photo" } - Add Photo - unless @garden.active .alert.alert-warning