Fix notification feed

pydio · Jul 27, 2014 · a7e4b54 · a7e4b54
1 parent a0b3256
commit a7e4b54
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/core/src/plugins/core.notifications/class.NotificationLoader.js b/core/src/plugins/core.notifications/class.NotificationLoader.js
@@ -309,7 +309,7 @@ Class.create("NotificationLoader", {
             "replaceScroller": false,
             "columnsDef":[
                 {"attributeName":"ajxp_label", "messageId":1, "sortType":"String"},
-                {"attributeName":"event_time", "messageString":"Time", "sortType":"MyDate"},
+                {"attributeName":"event_time", "messageString":"Time", "sortType":"Number"},
                 {"attributeName":"event_type", "messageString":"Type", "sortType":"String"}],
             "silentLoading":true,
             "fixedSortColumn":"event_time",
@@ -319,7 +319,7 @@ Class.create("NotificationLoader", {
                 "connexion_discrete":true,
                 "format":"xml", "current_repository":"true",
                 "feed_type":"notif",
-                "limit":(node.isLeaf() || node.isRoot() ? 12 : 4),
+                "limit":(node.isLeaf() || node.isRoot() ? 18 : 4),
                 "path":(node.isLeaf() || node.isRoot()?node.getPath():node.getPath()+'/'),
                 "merge_description":"true",
                 "description_as_label":node.isLeaf()?"true":"false"

diff --git a/core/src/plugins/feed.sql/class.AJXP_SqlFeedStore.php b/core/src/plugins/feed.sql/class.AJXP_SqlFeedStore.php
@@ -110,7 +110,7 @@ public function loadEvents($filterByRepositories, $filterByPath, $userGroup, $of
             if(!empty($filterByPath)){
                 $groupByClause = "";
                 if($filterByPath[strlen($filterByPath)-1]=='/'){
-                    $groupByClause = " GROUP BY [index_path] ";
+                    //$groupByClause = " GROUP BY [index_path] ";
                 }
                 $index_path = "ajxp.fs://".$filterByRepositories[0].$filterByPath."%";
                 $res = dibi::query("SELECT * FROM [ajxp_feed] WHERE [etype] = %s

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FilesList.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FilesList.js
@@ -1428,7 +1428,7 @@ Class.create("FilesList", SelectableElements, {
             }.bind(this));
             if(col){
                 var index = this.columnsDef.indexOf(col);
-                this._sortableTable.sort(index, (this.options.fixedSortDirection=="asc"));
+                this._sortableTable.sort(index, (this.options.fixedSortDirection=="desc"));
                 this._sortableTable.updateHeaderArrows();
             }
         }else if(contextNode.getMetadata().get("filesList.sortColumn") && this.columnsDef[contextNode.getMetadata().get("filesList.sortColumn")]){