Merge pull request #65 from antonioalmeida/vue

Fix urgent bug - sorry not sorry
antonioalmeida · May 30, 2018 · 4c102f9 · 4c102f9
2 parents 1dcdd04 + d5cfbd1
commit 4c102f9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/presto/app/Http/Resources/TopicResource.php b/presto/app/Http/Resources/TopicResource.php
@@ -32,6 +32,11 @@ public function toArray($request)
 
         $response['questions'] = QuestionResource::collection($this->questions);
 
+        if (Auth::user() != null)
+            $response['isModerator'] = Auth::user()->is_moderator;
+        else
+            $response['isModerator'] = false;
+
         return $response;
     }
 }
diff --git a/presto/resources/.DS_Store b/presto/resources/.DS_Store
diff --git a/presto/resources/assets/js/views/Topic.vue b/presto/resources/assets/js/views/Topic.vue
@@ -33,7 +33,7 @@
                                 >
                                 </follow-button>
 
-                                <router-link v-if="this.member.is_moderator" :to="'/topic/'+topic.name+'/edit'" class="btn btn-outline-light">
+                                <router-link v-if="this.topic.isModerator" :to="'/topic/'+topic.name+'/edit'" class="btn btn-outline-light">
                                     Edit Topic
                                 </router-link>
 
@@ -154,7 +154,6 @@
         mounted() {
             this.loader = this.$loading.show();
             this.getTopic(this.name);
-            this.getMember();
         },
 
         watch: {
@@ -182,16 +181,6 @@
                     .catch((error) => {
                         console.log(error);
                     });
-            },
-
-            getMember: function () {
-              axios.get('/api/profile/')
-                  .then(({data}) => {
-                      this.member = data;
-                  })
-                  .catch((error) => {
-                      this.member.is_moderator = false; //In case not logged in
-                  });
             }
         },