Merge branch 'develop'

pagekit · Mar 1, 2016 · 221b524 · 221b524
2 parents 9907f8e + 95143fb
commit 221b524
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 ### Fixed
 - Fixed post url in backend view
 - Fixed comments count
+- Fixed comments filters
 
 ## 0.10.1 (January 11, 2016)
 

diff --git a/app/views/admin/comment-index.js b/app/views/admin/comment-index.js
@@ -8,7 +8,7 @@ module.exports = {
         return _.merge({
             posts: [],
             config: {
-                filter: this.$session.get('comments.filter') || {}
+                filter: this.$session.get('comments.filter', {})
             },
             comments: false,
             pages: 0,
@@ -30,10 +30,17 @@ module.exports = {
 
     watch: {
 
-        'config.page': 'load',
+        'config.page': function (page, old) {
+            if (page == old) {
+                return;
+            }
+
+            this.load();
+        },
 
         'config.filter': {
             handler: function (filter) {
+                this.load();
                 this.$session.set('comments.filter', filter);
             },
             deep: true

diff --git a/app/views/admin/post-index.js b/app/views/admin/post-index.js
@@ -8,7 +8,7 @@ module.exports = {
         return _.merge({
             posts: false,
             config: {
-                filter: this.$session.get('posts.filter') || {order: 'date desc', limit:25}
+                filter: this.$session.get('posts.filter', {order: 'date desc', limit:25})
             },
             pages: 0,
             count: '',