diff --git a/client/src/area/Dashboard.vue b/client/src/area/Dashboard.vue index 97d2c60..02fcd9c 100644 --- a/client/src/area/Dashboard.vue +++ b/client/src/area/Dashboard.vue @@ -162,7 +162,8 @@ export default { methods: { init () { flowzModel.get(null, { - $limit: 0 + $limit: 0, + userId: this.$store.state.user._id }) .then((res) => { this.countFlowz = res.data.total diff --git a/client/src/components/SchemaSubForm.vue b/client/src/components/SchemaSubForm.vue index 084978d..e819f49 100644 --- a/client/src/components/SchemaSubForm.vue +++ b/client/src/components/SchemaSubForm.vue @@ -206,7 +206,7 @@ - {{field.name}}1 + {{field.name}} diff --git a/client/src/masterLayout/SideBar.vue b/client/src/masterLayout/SideBar.vue index c82f35b..05ccba3 100644 --- a/client/src/masterLayout/SideBar.vue +++ b/client/src/masterLayout/SideBar.vue @@ -156,7 +156,9 @@ export default { if (this.$store.state.role === 1) { this.loading = true flowzModal.get(null, { - $paginate: false + $paginate: false, + subscriptionId: this.$store.state.subscription, + userId: this.$store.state.user._id }) .then((response) => { this.loading = false diff --git a/client/src/pages/emailTemplate/emailTemplateList.vue b/client/src/pages/emailTemplate/emailTemplateList.vue index 2740d3c..3d57895 100644 --- a/client/src/pages/emailTemplate/emailTemplateList.vue +++ b/client/src/pages/emailTemplate/emailTemplateList.vue @@ -184,7 +184,8 @@ export default { }, init () { saveemailTemplate.get(null, { - 'user': this.$store.state.user._id, + subscriptionId: this.$store.state.subscription, + userId: this.$store.state.user._id, $skip: this.skip, $limit: this.limit }) diff --git a/client/src/pages/flow/List.vue b/client/src/pages/flow/List.vue index a458083..0573427 100644 --- a/client/src/pages/flow/List.vue +++ b/client/src/pages/flow/List.vue @@ -522,17 +522,6 @@ export default { this.getDataOfSubscriptionUser() }, feathers: { - 'flowz-instance': { - created (data) { // update status using socket - flowz.get() - .then(response => { - this.flowzList = response.data.data - }) - .catch(error => { - console.log(error) - }) - } - }, 'flowz': { created (data) { // console.log(this.limit) @@ -736,7 +725,9 @@ export default { this.loading = true flowz.get(null, { $skip: this.skip, - $limit: this.limit + $limit: this.limit, + subscriptionId: this.$store.state.subscription, + userId: this.$store.state.user._id }) .then(response => { this.total = response.data.total diff --git a/client/src/pages/schema/schemaList.vue b/client/src/pages/schema/schemaList.vue index 105d8b0..eb16c8a 100644 --- a/client/src/pages/schema/schemaList.vue +++ b/client/src/pages/schema/schemaList.vue @@ -186,7 +186,9 @@ isdeleted: false, '$sort[createdAt]': -1, $skip: this.skip, - $limit: this.$limit + $limit: this.$limit, + subscriptionId: this.$store.state.subscription, + userId: this.$store.state.user._id }).then(res => { this.loading = false this.total = res.data.total