From 70094a2d39083aff85b0ea29157ed487211a6055 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Tue, 16 Jan 2018 14:07:45 -0300 Subject: [PATCH] Swap instance-action-edit uncompleted requirements check and continuing from inquiry action for better usability flow --- app/templates/project/-edit-instance-action.emblem | 8 ++++---- tests/dummy/app/i18n/translations/action-list.coffee | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/templates/project/-edit-instance-action.emblem b/app/templates/project/-edit-instance-action.emblem index 14af60d..aee3cf2 100644 --- a/app/templates/project/-edit-instance-action.emblem +++ b/app/templates/project/-edit-instance-action.emblem @@ -87,11 +87,11 @@ table.ui.top.attached.compact.definition.table /button.ui.primary.button.modal-save.pull-right{action "saveRecord"}= t 'general.save' /button.ui.negative.button.modal-destroy.pull-right{action "destroyRecord"}= t 'general.destroy.button' if can_edit_action - if has_uncompleted_constraints - .pull-right.ui.negative.message= t 'project_instance_action.has_uncompleted_constraints_message' + if (eq model.state 'inquiry') + button.ui.pink.button.pull-right{action 'continue_from_inquiry'}= t 'action_list.continue_from_inquiry' else - if (eq model.state 'inquiry') - button.ui.pink.button.pull-right{action 'continue_from_inquiry'} Continue… + if has_uncompleted_constraints + .pull-right.ui.negative.message= t 'project_instance_action.has_uncompleted_constraints_message' else if (eq value_type 'boolean') if attached_conditions_not_met_warning diff --git a/tests/dummy/app/i18n/translations/action-list.coffee b/tests/dummy/app/i18n/translations/action-list.coffee index 65b8015..79dc4ce 100644 --- a/tests/dummy/app/i18n/translations/action-list.coffee +++ b/tests/dummy/app/i18n/translations/action-list.coffee @@ -1,5 +1,6 @@ translations = action_list: title: 'Action list' start_inquiry: 'Start ${attributes.state.inquiry}' + continue_from_inquiry: 'Continue…' add_note: 'Add note' export default translations