From fc152feebb5190eca583c9bd5a4eef860029bf14 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Thu, 26 Dec 2019 23:53:26 +1300 Subject: [PATCH 1/4] Update _quick_actions.haml --- app/views/plantings/_quick_actions.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/plantings/_quick_actions.haml b/app/views/plantings/_quick_actions.haml index 61d173ef2..74ac39314 100644 --- a/app/views/plantings/_quick_actions.haml +++ b/app/views/plantings/_quick_actions.haml @@ -6,7 +6,7 @@ %li= planting_edit_button(planting, classes: 'dropdown-item') %li= add_photo_button(planting, classes: 'dropdown-item') - - if planting.active? + - if planting.active %li= planting_finish_button(planting, classes: 'dropdown-item') %li= planting_harvest_button(planting, classes: 'dropdown-item') %li= planting_save_seeds_button(planting, classes: 'dropdown-item') From f4b87672b13675743f6c3dd58db19e58ae2122db Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Fri, 27 Dec 2019 00:11:46 +1300 Subject: [PATCH 2/4] Update _actions.html.haml --- app/views/plantings/_actions.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/plantings/_actions.html.haml b/app/views/plantings/_actions.html.haml index e974526af..aa58542e3 100644 --- a/app/views/plantings/_actions.html.haml +++ b/app/views/plantings/_actions.html.haml @@ -4,7 +4,7 @@ .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"} = planting_edit_button(planting, classes: 'dropdown-item') = add_photo_button(planting, classes: 'dropdown-item') - - if planting.active? + - if planting.active = planting_finish_button(planting, classes: 'dropdown-item') = planting_harvest_button(planting, classes: 'dropdown-item') = planting_save_seeds_button(planting, classes: 'dropdown-item') From 6c7bd777645c51ae2af6a78ec6098c60b33e39b6 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Fri, 27 Dec 2019 00:14:05 +1300 Subject: [PATCH 3/4] Update photo_capable.rb --- app/models/concerns/photo_capable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/concerns/photo_capable.rb b/app/models/concerns/photo_capable.rb index 94228047f..3144ec283 100644 --- a/app/models/concerns/photo_capable.rb +++ b/app/models/concerns/photo_capable.rb @@ -16,7 +16,7 @@ module PhotoCapable end def thumbnail_url - default_photo ? default_photos.thumbnail_url : nil + default_photo ? default_photo.thumbnail_url : nil end def most_liked_photo From 2d7951d85fe0d60743298bf0debd1049ccf7f62e Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Fri, 27 Dec 2019 00:15:05 +1300 Subject: [PATCH 4/4] Update buttons_helper.rb --- app/helpers/buttons_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/buttons_helper.rb b/app/helpers/buttons_helper.rb index ca5cc5d78..9cc5e11c6 100644 --- a/app/helpers/buttons_helper.rb +++ b/app/helpers/buttons_helper.rb @@ -89,7 +89,7 @@ module ButtonsHelper end def planting_harvest_button(planting, classes: 'btn btn-default') - return unless planting.active? && can?(:create, Harvest) && can?(:edit, planting) + return unless planting.active && can?(:create, Harvest) && can?(:edit, planting) link_to new_planting_harvest_path(planting), class: classes do harvest_icon + ' ' + t('buttons.record_harvest')