From 84ea0bf1f55c4b360af1c82072daa7dd9808d91b Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Wed, 17 Feb 2016 13:46:20 +0100 Subject: [PATCH 1/2] Several important fixes for beta4 - Fix socket error in autoupdate (Check if socket exists) - Add missing translation string for core permission - Fix KeyError in extract_default_password function in users/views.py - Improve Pagination. Fix users list for users without can_see_extra_data permissions. - Limit the number of users in ui-select field - Fix csv header names in users import help text. - Use config options (enable logo/title) on projector. - Nicer font style for main and sub items on agenda slide. - Fix JS error if this.groups is undefined for anonymous. --- openslides/agenda/static/js/agenda/site.js | 4 ++++ .../static/templates/agenda/item-detail.html | 2 +- .../static/templates/agenda/item-list.html | 5 ++++- .../static/templates/agenda/item-sort.html | 2 ++ .../templates/agenda/slide-item-list.html | 5 +++-- .../assignments/static/js/assignments/site.js | 3 +++ .../assignments/assignment-detail.html | 2 +- openslides/core/static/css/projector.css | 15 ++++++++----- openslides/core/static/js/core/base.js | 4 +++- .../core/static/templates/projector.html | 4 ++-- .../templates/mediafiles/mediafile-form.html | 2 +- openslides/motions/static/js/motions/site.js | 4 ++-- openslides/users/static/js/users/base.js | 5 ++++- openslides/users/static/js/users/site.js | 2 +- .../static/templates/users/user-import.html | 2 +- .../static/templates/users/user-list.html | 21 +++++++++++++------ openslides/users/views.py | 10 +++++++-- 17 files changed, 65 insertions(+), 27 deletions(-) diff --git a/openslides/agenda/static/js/agenda/site.js b/openslides/agenda/static/js/agenda/site.js index 594181d74..bf279cf53 100644 --- a/openslides/agenda/static/js/agenda/site.js +++ b/openslides/agenda/static/js/agenda/site.js @@ -216,6 +216,10 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda']) $scope.speakerSelectBox = {}; $scope.alert = {}; $scope.speakers = $filter('orderBy')(item.speakers, 'weight'); + + // limit the number of users in ui-select field + $scope.limitUsers = 50; + $scope.$watch(function () { return Agenda.lastModified(); }, function () { diff --git a/openslides/agenda/static/templates/agenda/item-detail.html b/openslides/agenda/static/templates/agenda/item-detail.html index 797323d63..12ffaafca 100644 --- a/openslides/agenda/static/templates/agenda/item-detail.html +++ b/openslides/agenda/static/templates/agenda/item-detail.html @@ -135,7 +135,7 @@ {{ $select.selected.get_full_name() }} - +
diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html index 4ced3496b..b2b856df8 100644 --- a/openslides/agenda/static/templates/agenda/item-list.html +++ b/openslides/agenda/static/templates/agenda/item-list.html @@ -203,5 +203,8 @@ Edit ... - + + diff --git a/openslides/agenda/static/templates/agenda/item-sort.html b/openslides/agenda/static/templates/agenda/item-sort.html index e43c29197..80981ffeb 100644 --- a/openslides/agenda/static/templates/agenda/item-sort.html +++ b/openslides/agenda/static/templates/agenda/item-sort.html @@ -18,12 +18,14 @@
  • +

    * Internal item