fix feedback comments hide

4 files changed, 16 insertions, 23 deletions

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 0b231a4..8e8dc9c 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -27,7 +27,6 @@ return [
 		['name' => 'settings#getOrder', 'url' => '/getOrder', 'verb' => 'GET'],
 		['name' => 'settings#savePersonal', 'url' => '/savePersonal', 'verb' => 'POST'],
 		['name' => 'settings#saveDefaultOrder', 'url' => '/saveDefaultOrder', 'verb' => 'POST'],
-		['name' => 'settings#getHidden', 'url' => '/getHidden', 'verb' => 'GET'],
 		['name' => 'settings#savePersonalHidden', 'url' => '/savePersonalHidden', 'verb' => 'POST'],
 		['name' => 'settings#saveDefaultHidden', 'url' => '/saveDefaultHidden', 'verb' => 'POST'],
 	]
diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php
index 7f542b2..1743b8f 100644
--- a/controller/settingscontroller.php
+++ b/controller/settingscontroller.php
@@ -100,7 +100,8 @@ class SettingsController extends Controller {
 	 */
 	public function getOrder() {
 		$order = $this->util->getAppOrder();
-		return array('status' => 'success', 'order' => $order);
+		$hidden = $this->util->getAppHidden();
+		return array('status' => 'success', 'order' => $order, 'hidden' => $hidden);
 	}
 
 	/**
@@ -138,17 +139,6 @@ class SettingsController extends Controller {
 	}
 
 	/**
-	 * Return hidden for current user
-	 *
-	 * @NoAdminRequired
-	 * @return array response
-	 */
-	public function gethidden() {
-		$hidden = $this->util->getAppHidden();
-		return array('status' => 'success', 'hidden' => $hidden);
-	}
-
-	/**
 	 * Admin: save default hidden
 	 *
 	 * @param $hidden
diff --git a/css/apporder.css b/css/apporder.css
index f925f09..dbc76e7 100644
--- a/css/apporder.css
+++ b/css/apporder.css
@@ -25,9 +25,9 @@
 	border-radius: 3px;
 }
 
-#appsorter input {
+#appsorter li input{
 	float: left;
-	margin:0;
+	margin: 0;
 }
 
 #appsorter li p {
diff --git a/js/apporder.js b/js/apporder.js
index fa72094..f410d94 100644
--- a/js/apporder.js
+++ b/js/apporder.js
@@ -11,22 +11,24 @@ $(function () {
 		parent.find('li').each(function () {
 			var id = $(this).find('a').attr('href');
 			if(hidden.includes(id)){
-				$(this).hide();
+				$(this).remove(); 
 			}
 			available_apps[id] = $(this);
 		});
+
+		//Remove hidden from order array
+		order = order.filter(function(e){ 
+			return !hidden.includes(e);
+		})
 		$.each(order, function (order, value) {
 			parent.prepend(available_apps[value]);
 		});
 	};
 
-	var order_request = $.get(OC.generateUrl('/apps/apporder/getOrder'));
-	var hidden_request = $.get(OC.generateUrl('/apps/apporder/getHidden'));
-
 	// restore existing order 
-	$.when(order_request, hidden_request).done(function (order_data, hidden_data) {
-		var order_json = order_data[0].order;
-		var hidden_json = hidden_data[0].hidden;
+	$.get(OC.generateUrl('/apps/apporder/getOrder'),function(data){
+		var order_json = data.order;
+		var hidden_json = data.hidden;
 		var order = [];
 		var hidden = [];
 		try {
@@ -44,10 +46,12 @@ $(function () {
 			app_menu.show();
 			return;
 		}
+
 		mapMenu($('#appmenu'), order, hidden);
 		mapMenu($('#apps').find('ul'), order, hidden);
 		$(window).trigger('resize');
 		app_menu.css('opacity', '1');
+
 	});
 
 	// Sorting inside settings
@@ -89,7 +93,7 @@ $(function () {
 
 		$(".apporderhidden").each(function(i, el){
 			if(!el.checked){
-				hiddenList.push($(el).siblings('a').attr('href'))
+				hiddenList.push($(el).siblings('p').attr('data-url'))
 			}
 		});