From 7b37021403fa5d4f2dedf3d06929e48e32e78f50 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 7 Jul 2015 00:29:02 -0400
Subject: [PATCH] FIX: Works with post menu as a component

---
 .../category-custom-settings/solved-settings.hbs          | 2 +-
 .../initializers/extend-for-solved-button.js.es6          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings.hbs b/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings.hbs
index 5ca91ce..fe2477a 100644
--- a/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings.hbs
+++ b/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings.hbs
@@ -2,7 +2,7 @@
 <section class='field'>
   <div class="enable-accepted-answer">
     <label class="checkbox-label">
-      {{input type="checkbox" checked=model.enable_accepted_answers}}
+      {{input type="checkbox" checked=category.enable_accepted_answers}}
       {{i18n 'solved.allow_accepted_answers'}}
     </label>
   </div>
diff --git a/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6 b/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6
index 162e9f8..53d9a6b 100644
--- a/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6
+++ b/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6
@@ -1,6 +1,6 @@
-import PostMenuView from 'discourse/views/post-menu';
+import PostMenuComponent from 'discourse/components/post-menu';
 import PostView from 'discourse/views/post';
-import { Button } from 'discourse/views/post-menu';
+import { Button } from 'discourse/components/post-menu';
 import Topic from 'discourse/models/topic';
 import User from 'discourse/models/user';
 import TopicStatus from 'discourse/views/topic-status';
@@ -59,7 +59,7 @@ export default {
       classNameBindings: ['post.accepted_answer:accepted-answer']
     });
 
-    PostMenuView.registerButton(function(visibleButtons){
+    PostMenuComponent.registerButton(function(visibleButtons){
       var position = 0;
 
       var canAccept = this.get('post.can_accept_answer');
@@ -87,7 +87,7 @@ export default {
 
     });
 
-    PostMenuView.reopen({
+    PostMenuComponent.reopen({
       acceptedChanged: function(){
         this.rerender();
       }.observes('post.accepted_answer'),