Merge pull request #291 from merefield/master

FIX: broken admin chat interface
gdpelican · Mar 23, 2020 · aedba3f · aedba3f
2 parents d8df91b + 9bd7265
commit aedba3f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/assets/javascripts/discourse/controllers/admin-chat.js.es6 b/assets/javascripts/discourse/controllers/admin-chat.js.es6
@@ -1,4 +1,5 @@
 import { ajax } from 'discourse/lib/ajax'
+import Topic from "discourse/models/topic";
 
 export default Ember.Controller.extend({
   adminChats: Ember.inject.controller(),
@@ -35,7 +36,7 @@ export default Ember.Controller.extend({
           topic: topicAttrs
         }
       }).then(function(saved) {
-        saved = Discourse.Topic.create(saved)
+        saved = Topic.create(saved)
         if (topic.id) {
           var topicIndex = _.map(allTopics, 'id').indexOf(topic.id)
           Ember.set(allTopics.objectAt(topicIndex), 'title', saved.title)

diff --git a/assets/javascripts/discourse/templates/admin/chat.hbs b/assets/javascripts/discourse/templates/admin/chat.hbs
@@ -20,7 +20,11 @@
     {{else}}
       <div>
         <label for="allowed_groups">{{i18n 'babble.admin.allowed_groups_label'}}</label>
-        {{multi-select allowAny=false content=available values=model.allowed_group_ids}}
+        {{multi-select
+          allowAny=false
+          content=available
+          value=model.allowed_group_ids
+        }}
       </div>
       <div>
         <label for="title">{{i18n 'babble.admin.title'}}</label>