From 54b8830c0a46a2fd9ad5716378b535a3ddea2e75 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Tue, 2 Jan 2018 20:56:02 -0300 Subject: [PATCH] No longer close on addidtion of instance action notes --- addon/styles/resources/_tracker-subject.sass | 2 +- addon/styles/resources/_workflow-groups.sass | 4 ++-- app/components/project/modals/edit-instance-action.coffee | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addon/styles/resources/_tracker-subject.sass b/addon/styles/resources/_tracker-subject.sass index 90d88bf..e0a4f0d 100644 --- a/addon/styles/resources/_tracker-subject.sass +++ b/addon/styles/resources/_tracker-subject.sass @@ -25,7 +25,7 @@ .collection-edit margin: 0 padding: 5px 12px - &.processing + &.processing, &.active @extend .title-box-primary &.rejected @extend .title-box-danger diff --git a/addon/styles/resources/_workflow-groups.sass b/addon/styles/resources/_workflow-groups.sass index 26fbdee..c8e5cd6 100644 --- a/addon/styles/resources/_workflow-groups.sass +++ b/addon/styles/resources/_workflow-groups.sass @@ -51,13 +51,13 @@ background-color: #ddd &.overdue background-color: #f7da00 - &.processing + &.processing, &.active background-color: #cef &.rejected background-color: #ff4848 &.completed background-color: #f2ffdd - &.processing + &.processing, &.active @extend .title-box-primary &.rejected @extend .title-box-danger diff --git a/app/components/project/modals/edit-instance-action.coffee b/app/components/project/modals/edit-instance-action.coffee index fc4c1ac..330bc33 100644 --- a/app/components/project/modals/edit-instance-action.coffee +++ b/app/components/project/modals/edit-instance-action.coffee @@ -120,7 +120,7 @@ export default ModalBase.extend event_timestamp: now new_note_event.save().then => @set 'new_note_content', '' - @send 'close' + #@send 'close' start_inquiry: -> record = @get('model') record.set 'state', 'inquiry'