From 8780c47fc143da5c9ef44b775b87702a642aa611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Mon, 12 Dec 2016 12:52:17 +0100
Subject: [PATCH] Minor fixes (Fixes #2750)

- Use <ul> instead of <ol> for candidate lists.
- Fix sorting by assignment_related_users.length in list view (Fixes #2750).
- Apply category and motion block for new amendments.
---
 openslides/assignments/static/js/assignments/pdf.js    |  2 +-
 .../assignments/static/js/assignments/projector.js     |  2 +-
 openslides/assignments/static/js/assignments/site.js   |  2 +-
 .../templates/assignments/assignment-detail.html       |  4 ++--
 .../static/templates/assignments/slide_assignment.html | 10 +++++-----
 openslides/core/static/css/app.css                     |  6 +-----
 openslides/motions/static/js/motions/site.js           |  2 ++
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/openslides/assignments/static/js/assignments/pdf.js b/openslides/assignments/static/js/assignments/pdf.js
index 8253da308..be89f1978 100644
--- a/openslides/assignments/static/js/assignments/pdf.js
+++ b/openslides/assignments/static/js/assignments/pdf.js
@@ -80,7 +80,7 @@ angular.module('OpenSlidesApp.assignments.pdf', ['OpenSlidesApp.core.pdf'])
                                 style: 'textItem'
                             },
                             {
-                                ol: userList,
+                                ul: userList,
                                 style: 'textItem'
                             }
                         ]
diff --git a/openslides/assignments/static/js/assignments/projector.js b/openslides/assignments/static/js/assignments/projector.js
index d93021c64..2be4c2749 100644
--- a/openslides/assignments/static/js/assignments/projector.js
+++ b/openslides/assignments/static/js/assignments/projector.js
@@ -22,7 +22,7 @@ angular.module('OpenSlidesApp.assignments.projector', ['OpenSlidesApp.assignment
         // Add it to the coresponding get_requirements method of the ProjectorElement
         // class.
         var id = $scope.element.id;
-        var poll = $scope.element.poll;
+        $scope.showResult = $scope.element.poll;
 
         Assignment.bindOne(id, $scope, 'assignment');
         Assignment.getPhases().then(function(phases) {
diff --git a/openslides/assignments/static/js/assignments/site.js b/openslides/assignments/static/js/assignments/site.js
index 520b966ad..160db603d 100644
--- a/openslides/assignments/static/js/assignments/site.js
+++ b/openslides/assignments/static/js/assignments/site.js
@@ -361,7 +361,7 @@ angular.module('OpenSlidesApp.assignments.site', [
              display_name: gettext('Title')},
             {name: 'phase',
              display_name: gettext('Phase')},
-            {name: 'assignment.assignment_related_users.length',
+            {name: 'assignment_related_users.length',
              display_name: gettext('Number of candidates')},
         ];
         $scope.hasTag = function (assignment, tag) {
diff --git a/openslides/assignments/static/templates/assignments/assignment-detail.html b/openslides/assignments/static/templates/assignments/assignment-detail.html
index ffd8db61f..900e1e4a5 100644
--- a/openslides/assignments/static/templates/assignments/assignment-detail.html
+++ b/openslides/assignments/static/templates/assignments/assignment-detail.html
@@ -82,7 +82,7 @@
 
   <div ng-if="assignment.phase != 2">
     <h3 translate>Candidates</h3>
-    <ol>
+    <ul>
       <li ng-repeat="related_user in assignment.assignment_related_users">
         <a ui-sref="users.user.detail({id: related_user.user_id})">{{ related_user.user.get_full_name() }}</a>
         <i ng-if="related_user.elected" class="fa fa-star" title="{{ 'is elected' | translate }}"></i>
@@ -90,7 +90,7 @@
             class="btn btn-default btn-xs">
           <i class="fa fa-times"></i>
         </button>
-    </ol>
+    </ul>
 
     <div class="form-group">
       <div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" ng-click="alert={}" close="alert={}">
diff --git a/openslides/assignments/static/templates/assignments/slide_assignment.html b/openslides/assignments/static/templates/assignments/slide_assignment.html
index 0c8dc016d..877d7f6aa 100644
--- a/openslides/assignments/static/templates/assignments/slide_assignment.html
+++ b/openslides/assignments/static/templates/assignments/slide_assignment.html
@@ -9,22 +9,22 @@
   </div>
 
   <!-- Description -->
-  <div ng-hide="element.poll" class="white-space-pre-line">
+  <div ng-if="!showResult && assignment.description !== ''" class="white-space-pre-line">
     {{ assignment.description }}
   </div>
 
   <!-- Candidates -->
-  <div ng-hide="element.poll">
+  <div ng-if="!showResult">
     <h3 translate>Candidates</h3>
-    <ol>
+    <ul>
       <li ng-repeat="related_user in assignment.assignment_related_users">
         {{ related_user.user.get_full_name() }}
         <i ng-if="related_user.elected" class="fa fa-star" title="{{ 'is elected' | translate }}"></i>
-    </ol>
+    </ul>
   </div>
 
   <!-- vote results -->
-  <div ng-show="element.poll" class="electionresults spacer" ng-repeat="poll in assignment.polls | filter: {id: element.poll}">
+  <div ng-show="showResult" class="electionresults spacer" ng-repeat="poll in assignment.polls | filter: {id: element.poll}">
     <table class="table table-bordered table-striped minimumTable">
     <tr>
       <th translate>Candidates
diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css
index dcb8e9615..48c05dd92 100644
--- a/openslides/core/static/css/app.css
+++ b/openslides/core/static/css/app.css
@@ -370,7 +370,7 @@ img {
     max-width: 100%;
     height: auto;
 }
-.col1 ol {
+.col1 ol, .col1 ul {
     margin-left: 15px;
 }
 .ballot-tabs ul {
@@ -437,10 +437,6 @@ img {
 .motion-text .highlight {
     background-color: #ff0;
 }
-
-.motion-text li {
-    margin-left: 30px;
-}
 .motion-text ins {
     color: green;
     text-decoration: underline;
diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js
index aa0a438f1..7c738ca57 100644
--- a/openslides/motions/static/js/motions/site.js
+++ b/openslides/motions/static/js/motions/site.js
@@ -1405,6 +1405,8 @@ angular.module('OpenSlidesApp.motions.site', [
             }
             $scope.model.title = $scope.$parent.motion.getTitle();
             $scope.model.parent_id = $scope.$parent.motion.id;
+            $scope.model.category_id = $scope.$parent.motion.category_id;
+            $scope.model.motion_block_id = $scope.$parent.motion.motion_block_id;
             Motion.bindOne($scope.model.parent_id, $scope, 'parent');
         }
         // ... preselect default workflow