From 65fcd8e9d6a8d9894a831de5987fd5c40ffe3733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Mon, 27 Feb 2017 09:36:21 +0100
Subject: [PATCH] Fixed forms (added missing operator).

Also:
- Move motion state filter to 2nd filter position (as in detail view).
- Open dropdown filter of state and recommendation on left side.
---
 .../motions/static/js/motions/motion-block.js |  3 +-
 .../static/templates/motions/motion-list.html | 58 +++++++++----------
 openslides/topics/static/js/topics/site.js    |  3 +-
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/openslides/motions/static/js/motions/motion-block.js b/openslides/motions/static/js/motions/motion-block.js
index 25fc766d3..1aced4f4e 100644
--- a/openslides/motions/static/js/motions/motion-block.js
+++ b/openslides/motions/static/js/motions/motion-block.js
@@ -49,10 +49,11 @@ angular.module('OpenSlidesApp.motions.motionBlock', [])
 // MotionBlock views (list view, create dialog, update dialog)
 .factory('MotionBlockForm', [
     '$http',
+    'operator',
     'gettextCatalog',
     'Agenda',
     'AgendaTree',
-    function ($http, gettextCatalog, Agenda, AgendaTree) {
+    function ($http, operator, gettextCatalog, Agenda, AgendaTree) {
         return {
             // Get ngDialog configuration.
             getDialog: function (motionBlock) {
diff --git a/openslides/motions/static/templates/motions/motion-list.html b/openslides/motions/static/templates/motions/motion-list.html
index 2b0bb6260..76e43e8df 100644
--- a/openslides/motions/static/templates/motions/motion-list.html
+++ b/openslides/motions/static/templates/motions/motion-list.html
@@ -164,7 +164,7 @@
               <translate>State</translate>
               <span class="caret"></span>
             </span>
-            <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownState">
+            <ul class="dropdown-menu dropdown-menu-left" aria-labelledby="dropdownState">
               <li ng-repeat="state in states" ng-class="state.workflowHeader ? 'dropdown-header' : ''">
                 <a ng-if="state.workflowHeader">
                   {{ state.headername | translate }}
@@ -184,6 +184,34 @@
               </li>
             </ul>
           </span>
+          <!-- recommendation filter -->
+          <span uib-dropdown ng-if="config('motions_recommendations_by') != ''">
+            <span class="pointer" id="dropdownRecommendation" uib-dropdown-toggle
+              ng-class="{'bold': filter.multiselectFilters.recommendation.length > 0, 'disabled': isSelectMode}"
+              ng-disabled="isSelectMode">
+              <translate>Recommendation</translate>
+              <span class="caret"></span>
+            </span>
+            <ul class="dropdown-menu dropdown-menu-left" aria-labelledby="dropdownRecommentation">
+              <li ng-repeat="recommendation in recommendations" ng-class="recommendation.workflowHeader ? 'dropdown-header' : ''">
+                <a ng-if="recommendation.workflowHeader">
+                  {{ recommendation.headername | translate }}
+                </a>
+                <a href ng-if="!recommendation.workflowHeader"
+                  ng-click="filter.operateMultiselectFilter('recommendation', recommendation.id, isSelectMode)">
+                  <i class="fa fa-check" ng-if="filter.multiselectFilters.recommendation.indexOf(recommendation.id) > -1"></i>
+                  {{ recommendation.recommendation_label | translate }}
+                </a>
+              </li>
+              <li class="divider"></li>
+              <li>
+                <a href ng-click="filter.operateMultiselectFilter('recommendation', -1, isSelectMode)">
+                  <i class="fa fa-check" ng-if="filter.multiselectFilters.recommendation.indexOf(-1) > -1"></i>
+                  <translate>No recommendation set</translate>
+                </a>
+              </li>
+            </ul>
+          </span>
           <!-- Category filter -->
           <span uib-dropdown ng-if="categories.length > 0">
             <span class="pointer" id="dropdownCategory" uib-dropdown-toggle
@@ -232,34 +260,6 @@
               </li>
             </ul>
           </span>
-          <!-- recommendation filter -->
-          <span uib-dropdown ng-if="config('motions_recommendations_by') != ''">
-            <span class="pointer" id="dropdownRecommendation" uib-dropdown-toggle
-              ng-class="{'bold': filter.multiselectFilters.recommendation.length > 0, 'disabled': isSelectMode}"
-              ng-disabled="isSelectMode">
-              <translate>Recommendation</translate>
-              <span class="caret"></span>
-            </span>
-            <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownRecommentation">
-              <li ng-repeat="recommendation in recommendations" ng-class="recommendation.workflowHeader ? 'dropdown-header' : ''">
-                <a ng-if="recommendation.workflowHeader">
-                  {{ recommendation.headername | translate }}
-                </a>
-                <a href ng-if="!recommendation.workflowHeader"
-                  ng-click="filter.operateMultiselectFilter('recommendation', recommendation.id, isSelectMode)">
-                  <i class="fa fa-check" ng-if="filter.multiselectFilters.recommendation.indexOf(recommendation.id) > -1"></i>
-                  {{ recommendation.recommendation_label | translate }}
-                </a>
-              </li>
-              <li class="divider"></li>
-              <li>
-                <a href ng-click="filter.operateMultiselectFilter('recommendation', -1, isSelectMode)">
-                  <i class="fa fa-check" ng-if="filter.multiselectFilters.recommendation.indexOf(-1) > -1"></i>
-                  <translate>No recommendation set</translate>
-                </a>
-              </li>
-            </ul>
-          </span>
           <!-- Tag filter -->
           <span uib-dropdown ng-if="tags.length > 0">
             <span class="pointer" id="dropdownTag" uib-dropdown-toggle
diff --git a/openslides/topics/static/js/topics/site.js b/openslides/topics/static/js/topics/site.js
index a758fb24a..e88652164 100644
--- a/openslides/topics/static/js/topics/site.js
+++ b/openslides/topics/static/js/topics/site.js
@@ -62,11 +62,12 @@ angular.module('OpenSlidesApp.topics.site', ['OpenSlidesApp.topics', 'OpenSlides
 
 .factory('TopicForm', [
     'gettextCatalog',
+    'operator',
     'Editor',
     'Mediafile',
     'Agenda',
     'AgendaTree',
-    function (gettextCatalog, Editor, Mediafile, Agenda, AgendaTree) {
+    function (gettextCatalog, operator, Editor, Mediafile, Agenda, AgendaTree) {
         return {
             // ngDialog for topic form
             getDialog: function (topic) {