Merge pull request #622 from FlowzPlatform/issue-594-n7

Issue 594 n7
FlowzPlatform · Oct 10, 2018 · a9d2f25 · a9d2f25
2 parents 56dfcfa + 8c92c18
commit a9d2f25
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/client/src/components/cellRender.vue b/client/src/components/cellRender.vue
@@ -209,7 +209,8 @@ export default {
                 this.schemainstance.entity[index]['entity'] = await this.getChildEntity(entity.type)
               }
             }
-            this.schemainstance.data.push(this.currentPopTipData)
+            // this.schemainstance.data.push(this.currentPopTipData)
+            this.schemainstance.data[0] = this.item.obj
             this.dataModal = true
             this.$Spin.hide()
           }).catch(err => {

diff --git a/client/src/pages/flow/analytics.vue b/client/src/pages/flow/analytics.vue
@@ -336,6 +336,10 @@ export default {
         '$search': query,
         $group: '_uuid'
       }
+      if (this.$store.state.role === 2) {
+        params._creatorid = this.$store.state.user._id
+        params.subscriptionId = this.$store.state.subscription
+      }
       if (sort !== undefined || sort !== null) {
         if (sort === 'asc') {
           params['$sort[' + sort + ']'] = 1
@@ -479,8 +483,8 @@ export default {
           $limit: this.limit,
           $group: '_uuid',
           'subscriptionId': this.$store.state.subscription,
-          '_creatorId': this.$store.state.subscription,
-          '$sort[_createdAt]': 1
+          '_creatorid': this.$store.state.user._id,
+          '$sort[_createdAt]': -1
         }
       }
 
@@ -721,7 +725,7 @@ export default {
         key = '_uuid'
         title = 'ID'
       }
-      console.log('OBJ: ', obj)
+      // console.log('OBJ: ', obj)
       cols.push({
         title: title,
         key: key,