diff --git a/openslides/agenda/serializers.py b/openslides/agenda/serializers.py index 23d916dbd..0b0aeba38 100644 --- a/openslides/agenda/serializers.py +++ b/openslides/agenda/serializers.py @@ -56,6 +56,7 @@ class ItemSerializer(ModelSerializer): 'comment', 'closed', 'type', + 'is_hidden', 'duration', 'speakers', 'speaker_list_closed', diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html index 77d50438b..4b4974b4a 100644 --- a/openslides/agenda/static/templates/agenda/item-list.html +++ b/openslides/agenda/static/templates/agenda/item-list.html @@ -40,7 +40,7 @@ @@ -75,11 +75,11 @@
- - Hide internal items + + Show internal items - - Hide closed items + + Show closed items
@@ -115,10 +115,10 @@ Done - + ng-class="{ 'activeline': item.isProjected(), 'selected': item.selected, 'hiddenrow': item.is_hidden}"> - {{ item.getTitle() }} +
{{ item.comment }}
diff --git a/openslides/assignments/static/js/assignments/base.js b/openslides/assignments/static/js/assignments/base.js index a40613ba6..9abaa1671 100644 --- a/openslides/assignments/static/js/assignments/base.js +++ b/openslides/assignments/static/js/assignments/base.js @@ -85,7 +85,7 @@ angular.module('OpenSlidesApp.assignments', []) if (!this.phases) { this.phases = $http({ 'method': 'OPTIONS', 'url': '/rest/assignments/assignment/' }); } - return phases; + return this.phases; }, methods: { getResourceName: function () { diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css index c3e8fbd51..185f3c9dd 100644 --- a/openslides/core/static/css/app.css +++ b/openslides/core/static/css/app.css @@ -696,7 +696,7 @@ th.sortable:hover, tr.pointer:hover, .pointer { /* background colors for table rows */ tr.hiddenrow td { - background-color: #e5e5e5; + background-color: #F5DCDC; } tr.activeline td, li.activeline, .projected { diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js index bae91d8d3..20752dde8 100644 --- a/openslides/users/static/js/users/site.js +++ b/openslides/users/static/js/users/site.js @@ -370,7 +370,7 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users']) templateOptions: { label: gettextCatalog.getString('Is active'), description: gettextCatalog.getString( - 'Designates whether this user should be treated as ' + 'Designates whether this user should be treated as ' + 'active. Unselect this instead of deleting the account.') } }];