fixed weird showAll post request

2 files changed, 5 insertions, 15 deletions

diff --git a/ajax/usersettings.php b/ajax/usersettings.php
index 9ddd69f6e..27fc11cb1 100644
--- a/ajax/usersettings.php
+++ b/ajax/usersettings.php
@@ -15,16 +15,8 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('news');
 OCP\JSON::callCheck();
 
-switch($_POST['show']){
-    case 'all':
-        $showAll = true;
-        break;
-    default:
-        $showAll = false;
-        break;
+if(isset($_POST['showAll'])){
+    OCP\Config::setUserValue(OCP\USER::getUser(), 'news', 'showAll', $_POST['showAll']);     
 }
 
-// TODO: receive and save user settings
-OCP\Config::setUserValue(OCP\USER::getUser(), 'news', 'showAll', $showAll); 
-
 OCP\JSON::success();
\ No newline at end of file
diff --git a/js/main.js b/js/main.js
index cf4351c3b..467316c03 100644
--- a/js/main.js
+++ b/js/main.js
@@ -103,12 +103,10 @@ $(document).ready(function(){
         var data = {};
         var showAll;
         if($(this).hasClass('show_all')){
-            data.show = 'unread';
-            showAll = false;
+            data.showAll = false;
             $(this).addClass('show_unread').removeClass('show_all');
         } else {
-            data.show  = 'all';
-            showAll = true;
+            data.showAll = true;
             $(this).addClass('show_all').removeClass('show_unread');
         }
         
@@ -116,7 +114,7 @@ $(document).ready(function(){
         
         $.post(OC.filePath('news', 'ajax', 'usersettings.php'), data, function(jsondata){
             if(jsondata.status == 'success'){
-                News.Objects.Menu.setShowAll(showAll);
+                News.Objects.Menu.setShowAll(data.showAll);
             } else {
                 OC.dialogs.alert(jsonData.data.message, t('news', 'Error'));
             }