Merge pull request #6790 from mabashian/4853-survey-workflow-buttons

Show survey and workflow editor buttons even when the editor is open
This commit is contained in:
Michael Abashian
2017-06-29 10:37:07 -04:00
committed by GitHub

View File

@@ -165,7 +165,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
}, },
add_survey: { add_survey: {
ngClick: 'addSurvey()', ngClick: 'addSurvey()',
ngShow: '!survey_exists && ($state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\'))', ngShow: '!survey_exists && ($state.includes(\'templates.addWorkflowJobTemplate\') || $state.includes(\'templates.editWorkflowJobTemplate\'))',
awFeature: 'surveys', awFeature: 'surveys',
awToolTip: '{{surveyTooltip}}', awToolTip: '{{surveyTooltip}}',
dataPlacement: 'top', dataPlacement: 'top',
@@ -175,7 +175,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
edit_survey: { edit_survey: {
ngClick: 'editSurvey()', ngClick: 'editSurvey()',
awFeature: 'surveys', awFeature: 'surveys',
ngShow: 'survey_exists && ($state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\'))', ngShow: 'survey_exists && ($state.includes(\'templates.addWorkflowJobTemplate\') || $state.includes(\'templates.editWorkflowJobTemplate\'))',
label: i18n._('Edit Survey'), label: i18n._('Edit Survey'),
class: 'Form-primaryButton', class: 'Form-primaryButton',
awToolTip: '{{surveyTooltip}}', awToolTip: '{{surveyTooltip}}',
@@ -183,7 +183,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
}, },
workflow_editor: { workflow_editor: {
ngClick: 'openWorkflowMaker()', ngClick: 'openWorkflowMaker()',
ngShow: '$state.is(\'templates.addWorkflowJobTemplate\') || $state.is(\'templates.editWorkflowJobTemplate\')', ngShow: '$state.includes(\'templates.addWorkflowJobTemplate\') || $state.includes(\'templates.editWorkflowJobTemplate\')',
awToolTip: '{{workflowEditorTooltip}}', awToolTip: '{{workflowEditorTooltip}}',
dataPlacement: 'top', dataPlacement: 'top',
label: i18n._('Workflow Editor'), label: i18n._('Workflow Editor'),