Skip to content
This repository has been archived by the owner on Oct 30, 2023. It is now read-only.

subscription-wise-calls #598

Merged
merged 2 commits into from
Oct 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion client/src/area/Dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/SchemaSubForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
<FormItem :key="inx" :rules="createRules(field)" style="margin-bottom:10px;">
<Row>
<Col :span="2">
<b>{{field.name}}</b>1
<b>{{field.name}}</b>
</Col>
<Col :span="21" >
<input class="form-control" type="file" v-if="field.type == 'file'" @change="handleFileChange($event, index, field.name)" :multiple="(field.property.isMultiple)? field.property.isMultiple: false"/>
Expand Down
4 changes: 3 additions & 1 deletion client/src/masterLayout/SideBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion client/src/pages/emailTemplate/emailTemplateList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
Expand Down
15 changes: 3 additions & 12 deletions client/src/pages/flow/List.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion client/src/pages/schema/schemaList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down