From 71470463c66ead616f8e481a7513f4858cb75ae3 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Thu, 10 Oct 2019 10:09:51 +0200
Subject: Fix remaining comments from #16706
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/workflowengine/src/helpers/api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apps/workflowengine/src/helpers/api.js')

diff --git a/apps/workflowengine/src/helpers/api.js b/apps/workflowengine/src/helpers/api.js
index 2b2bb40a7e2..ee4e8c7a520 100644
--- a/apps/workflowengine/src/helpers/api.js
+++ b/apps/workflowengine/src/helpers/api.js
@@ -19,11 +19,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+const scopeValue = OCP.InitialState.loadState('workflowengine', 'scope') === 0 ? 'global' : 'user'
 
 import { loadState } from '@nextcloud/initial-state'
 
 const getApiUrl = (url) => {
-	const scopeValue = loadState('workflowengine', 'scope') === 0 ? 'global' : 'user'
 	return OC.linkToOCS('apps/workflowengine/api/v1/workflows', 2) + scopeValue + url + '?format=json'
 }
 
-- 
cgit v1.2.3


From 928cf4bfcc2da4d12b2be915f6b77c1ea132cd2d Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Tue, 15 Oct 2019 20:19:38 +0200
Subject: Fix issue with unavailable operations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/workflowengine/src/components/Rule.vue | 2 +-
 apps/workflowengine/src/helpers/api.js      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'apps/workflowengine/src/helpers/api.js')

diff --git a/apps/workflowengine/src/components/Rule.vue b/apps/workflowengine/src/components/Rule.vue
index 2d3d5c8491a..fb04112b178 100644
--- a/apps/workflowengine/src/components/Rule.vue
+++ b/apps/workflowengine/src/components/Rule.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="section rule" :style="{ borderLeftColor: operation.color || '' }">
+	<div v-if="operation" class="section rule" :style="{ borderLeftColor: operation.color || '' }">
 		<div class="trigger">
 			<p>
 				<span>{{ t('workflowengine', 'When') }}</span>
diff --git a/apps/workflowengine/src/helpers/api.js b/apps/workflowengine/src/helpers/api.js
index ee4e8c7a520..76861d3bb35 100644
--- a/apps/workflowengine/src/helpers/api.js
+++ b/apps/workflowengine/src/helpers/api.js
@@ -19,10 +19,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-const scopeValue = OCP.InitialState.loadState('workflowengine', 'scope') === 0 ? 'global' : 'user'
 
 import { loadState } from '@nextcloud/initial-state'
 
+const scopeValue = loadState('workflowengine', 'scope') === 0 ? 'global' : 'user'
+
 const getApiUrl = (url) => {
 	return OC.linkToOCS('apps/workflowengine/api/v1/workflows', 2) + scopeValue + url + '?format=json'
 }
-- 
cgit v1.2.3