Store sort order on server

5 files changed, 16 insertions, 16 deletions

diff --git a/templates/main.php b/templates/main.php
index 2f6ce92b..3bdf85a5 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -167,46 +167,46 @@
             </div>
             <div class="app-navigation-entry-menu bubble sortorder-dropdown">
                 <ul>
-                    <li ng-click="setSortOrder($event, 'default')" ng-class="{active: sortOrder == 'default'}" class="handler">
+                    <li ng-click="setSortOrder($event, 'default')" ng-class="{active: settingsmodel.getById('various').sortOrder == 'default'}" class="handler">
                         <span>
                             <span class="icon list-list"></span>
                             <span><?php p($l->t('Default')); ?></span>
-                            <span class="sort-indicator" ng-class="{'icon-triangle-n': sortDirection, 'icon-triangle-s': !sortDirection}"></span>
+                            <span class="sort-indicator" ng-class="{'icon-triangle-n': settingsmodel.getById('various').sortDirection, 'icon-triangle-s': !settingsmodel.getById('various').sortDirection}"></span>
                         </span>
                     </li>
-                    <li ng-click="setSortOrder($event, 'due')" ng-class="{active: sortOrder == 'due'}">
+                    <li ng-click="setSortOrder($event, 'due')" ng-class="{active: settingsmodel.getById('various').sortOrder == 'due'}">
                         <span>
                             <span class="icon detail-date"></span>
                             <span><?php p($l->t('Due date')); ?></span>
-                            <span class="sort-indicator" ng-class="{'icon-triangle-n': sortDirection, 'icon-triangle-s': !sortDirection}"></span>
+                            <span class="sort-indicator" ng-class="{'icon-triangle-n': settingsmodel.getById('various').sortDirection, 'icon-triangle-s': !settingsmodel.getById('various').sortDirection}"></span>
                         </span>
                     </li>
-                    <li ng-click="setSortOrder($event, 'start')" ng-class="{active: sortOrder == 'start'}">
+                    <li ng-click="setSortOrder($event, 'start')" ng-class="{active: settingsmodel.getById('various').sortOrder == 'start'}">
                         <span>
                             <span class="icon detail-start"></span>
                             <span><?php p($l->t('Start date')); ?></span>
-                            <span class="sort-indicator" ng-class="{'icon-triangle-n': sortDirection, 'icon-triangle-s': !sortDirection}"></span>
+                            <span class="sort-indicator" ng-class="{'icon-triangle-n': settingsmodel.getById('various').sortDirection, 'icon-triangle-s': !settingsmodel.getById('various').sortDirection}"></span>
                         </span>
                     </li>
-                    <li ng-click="setSortOrder($event, 'priority')" ng-class="{active: sortOrder == 'priority'}">
+                    <li ng-click="setSortOrder($event, 'priority')" ng-class="{active: settingsmodel.getById('various').sortOrder == 'priority'}">
                         <span>
                             <span class="icon detail-priority"></span>
                             <span><?php p($l->t('Priority')); ?></span>
-                            <span class="sort-indicator" ng-class="{'icon-triangle-n': sortDirection, 'icon-triangle-s': !sortDirection}"></span>
+                            <span class="sort-indicator" ng-class="{'icon-triangle-n': settingsmodel.getById('various').sortDirection, 'icon-triangle-s': !settingsmodel.getById('various').sortDirection}"></span>
                         </span>
                     </li>
-                    <li ng-click="setSortOrder($event, 'alphabetically')" ng-class="{active: sortOrder == 'alphabetically'}">
+                    <li ng-click="setSortOrder($event, 'alphabetically')" ng-class="{active: settingsmodel.getById('various').sortOrder == 'alphabetically'}">
                         <span>
                             <span class="icon sort-alphabetically"></span>
                             <span><?php p($l->t('Alphabetically')); ?></span>
-                            <span class="sort-indicator" ng-class="{'icon-triangle-n': sortDirection, 'icon-triangle-s': !sortDirection}"></span>
+                            <span class="sort-indicator" ng-class="{'icon-triangle-n': settingsmodel.getById('various').sortDirection, 'icon-triangle-s': !settingsmodel.getById('various').sortDirection}"></span>
                         </span>
                     </li>
-                    <li ng-click="setSortOrder($event, 'manual')" ng-class="{active: sortOrder == 'manual'}">
+                    <li ng-click="setSortOrder($event, 'manual')" ng-class="{active: settingsmodel.getById('various').sortOrder == 'manual'}">
                         <span>
                             <span class="icon sort-manual"></span>
                             <span><?php p($l->t('Manually')); ?></span>
-                            <span class="sort-indicator" ng-class="{'icon-triangle-n': sortDirection, 'icon-triangle-s': !sortDirection}"></span>
+                            <span class="sort-indicator" ng-class="{'icon-triangle-n': settingsmodel.getById('various').sortDirection, 'icon-triangle-s': !settingsmodel.getById('various').sortDirection}"></span>
                         </span>
                     </li>
                 </ul>
diff --git a/templates/part.collectionall.php b/templates/part.collectionall.php
index e826dffd..3062c17f 100644
--- a/templates/part.collectionall.php
+++ b/templates/part.collectionall.php
@@ -14,7 +14,7 @@
             <li class="task-item ui-draggable handler"
                 taskID="{{task.uri}}"
                 ng-animate="'animate'"
-                ng-repeat="task in filtered = filteredTasks() | filter:hasNoParent(task) | filter:filterTasks(task,calendar.uri) | filter:filterTasks(task,route.collectionID) | orderBy:getSortOrder():sortDirection"
+                ng-repeat="task in filtered = filteredTasks() | filter:hasNoParent(task) | filter:filterTasks(task,calendar.uri) | filter:filterTasks(task,route.collectionID) | orderBy:getSortOrder():settingsmodel.getById('various').sortDirection"
                 ng-click="openDetails(task.uri,$event)"
                 ng-class="{done: task.completed}"
                 dnd-draggable="task"
diff --git a/templates/part.collectionweek.php b/templates/part.collectionweek.php
index 0b0d7e7e..eb442e0b 100644
--- a/templates/part.collectionweek.php
+++ b/templates/part.collectionweek.php
@@ -13,7 +13,7 @@
             <li class="task-item ui-draggable handler"
                 taskID="{{task.uri}}"
                 ng-animate="'animate'"
-                ng-repeat="task in filtered = filteredTasks() | filter:taskAtDay(task,day) | filter:hasNoParent(task) | filter:{'completed':'false'} | orderBy:getSortOrder():sortDirection"
+                ng-repeat="task in filtered = filteredTasks() | filter:taskAtDay(task,day) | filter:hasNoParent(task) | filter:{'completed':'false'} | orderBy:getSortOrder():settingsmodel.getById('various').sortDirection"
                 ng-click="openDetails(task.uri,$event)"
                 ng-class="{done: task.completed}"
                 dnd-draggable="task"
diff --git a/templates/part.taskbody.php b/templates/part.taskbody.php
index fb1bd811..e4c08874 100644
--- a/templates/part.taskbody.php
+++ b/templates/part.taskbody.php
@@ -49,7 +49,7 @@
         </li>
         <li taskID="{{ task.uri }}"
             class="task-item ui-draggable handler subtask"
-            ng-repeat="task in getSubTasks(filtered,task) | orderBy:getSortOrder():sortDirection"
+            ng-repeat="task in getSubTasks(filtered,task) | orderBy:getSortOrder():settingsmodel.getById('various').sortDirection"
             ng-click="openDetails(task.uri,$event)"
             ng-class="{done: task.completed}"
             ng-include="'part.taskbody'"
diff --git a/templates/part.tasklist.php b/templates/part.tasklist.php
index f8855572..12b7824a 100644
--- a/templates/part.tasklist.php
+++ b/templates/part.tasklist.php
@@ -11,7 +11,7 @@
             dnd-dragover="dragover(event, index)">
             <li class="task-item ui-draggable handler"
                 taskID="{{ task.uri }}"
-                ng-repeat="task in filtered = filteredTasks() | filter:hasNoParent(task) | filter:filterTasks(task,route.calendarID) | filter:{'completed':'false'} | orderBy:getSortOrder():sortDirection"
+                ng-repeat="task in filtered = filteredTasks() | filter:hasNoParent(task) | filter:filterTasks(task,route.calendarID) | filter:{'completed':'false'} | orderBy:getSortOrder():settingsmodel.getById('various').sortDirection"
                 ng-click="openDetails(task.uri,$event)"
                 ng-class="{done: task.completed}"
                 dnd-draggable="task"