From 111b9e3fd7b9ef3284b68e502de8cf09ef463b97 Mon Sep 17 00:00:00 2001
From: FinnStutzenstein <finn.stutzenstein@rats-os.de>
Date: Mon, 17 Oct 2016 08:47:20 +0200
Subject: [PATCH] use check icon and no post request on deselect (fixes #2471)

---
 openslides/agenda/static/templates/agenda/item-list.html    | 2 +-
 openslides/core/static/js/core/site.js                      | 6 ++++--
 .../core/static/templates/core/projector-controls.html      | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html
index e3a6d9833..fcac9880d 100644
--- a/openslides/agenda/static/templates/agenda/item-list.html
+++ b/openslides/agenda/static/templates/agenda/item-list.html
@@ -164,7 +164,7 @@
           ng-class="{ 'activeline': item.isProjected(), 'selected': item.selected, 'hiddenrow': item.is_hidden}">
         <!-- projector column -->
         <td ng-show="!isDeleteMode" os-perms="core.can_manage_projector">
-          <div class="btn-group" style="min-width:{{ projectors.length > 1 ? '54' : '34' }}px;" uib-dropdown
+          <div class="btn-group" style="min-width:{{ (item.hasSubitems(items) || projectors.length > 1) ? '54' : '34' }}px;" uib-dropdown
             uib-tooltip="{{ 'Projector' | translate }} {{ item.isProjected(item.tree) }}"
             tooltip-enable="item.isProjected(item.tree) > 0">
             <button class="btn btn-default btn-sm"
diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js
index 325c79203..0124eaf15 100644
--- a/openslides/core/static/js/core/site.js
+++ b/openslides/core/static/js/core/site.js
@@ -1130,8 +1130,10 @@ angular.module('OpenSlidesApp.core.site', [
         };
 
         // Projector functions
-        $scope.setProjectionDefault = function (projector, def) {
-            $http.post('/rest/core/projector/' + projector.id + '/set_projectiondefault/', def.id);
+        $scope.setProjectionDefault = function (projector, projectiondefault) {
+            if (projectiondefault.projector_id !== projector.id) {
+                $http.post('/rest/core/projector/' + projector.id + '/set_projectiondefault/', projectiondefault.id);
+            }
         };
         $scope.createProjector = function (name) {
             var projector = {
diff --git a/openslides/core/static/templates/core/projector-controls.html b/openslides/core/static/templates/core/projector-controls.html
index e8d2c4bb3..f6ecfedee 100644
--- a/openslides/core/static/templates/core/projector-controls.html
+++ b/openslides/core/static/templates/core/projector-controls.html
@@ -34,7 +34,6 @@
             <div class="dropdown" ng-show="projectors.length > 1">
               <button class="btn btn-default btn-sm dropdown-toggle" id="menuProjector" data-toggle="dropdown"
                 aria-haspopup="true" aria-expanded="true">
-                <i class="fa fa-video-camera"></i>
                 {{ active_projector.name }}
                 <span class="caret"></span>
               </button>
@@ -42,7 +41,7 @@
                 <li ng-repeat="projector in projectors"
                   ng-class="{'projected': projector === active_projector}"
                   ng-click="changeProjector(projector)">
-                  <i ng-show="projector === active_projector" class="fa fa-video-camera"></i>
+                  <i ng-show="projector === active_projector" class="fa fa-check"></i>
                   {{ projector.name }}
                   <i ng-show="projector.id == broadcast" class="fa fa-star-o spacer-left"></i>
                 </li>