From b73c50a4f9cade8231a5aeed3e93cb0de9ea6c5b Mon Sep 17 00:00:00 2001 From: FinnStutzenstein Date: Fri, 10 Feb 2017 09:11:45 +0100 Subject: [PATCH] Fixed missing

tags for motion import and some improvements. --- openslides/agenda/static/templates/agenda/item-list.html | 2 +- .../static/templates/assignments/assignment-list.html | 2 +- .../static/templates/mediafiles/mediafile-list.html | 2 +- openslides/motions/static/js/motions/site.js | 9 +++++++++ .../motions/static/templates/motions/motion-detail.html | 2 +- .../motions/static/templates/motions/motion-list.html | 2 +- openslides/users/static/templates/users/user-list.html | 2 +- 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html index 0f44ecc14..17ede633d 100644 --- a/openslides/agenda/static/templates/agenda/item-list.html +++ b/openslides/agenda/static/templates/agenda/item-list.html @@ -121,7 +121,7 @@ + class="btn btn-default btn-sm btn-danger"> Delete selected items diff --git a/openslides/assignments/static/templates/assignments/assignment-list.html b/openslides/assignments/static/templates/assignments/assignment-list.html index ffb8d6ae5..d8f61a412 100644 --- a/openslides/assignments/static/templates/assignments/assignment-list.html +++ b/openslides/assignments/static/templates/assignments/assignment-list.html @@ -64,7 +64,7 @@ + class="btn btn-default btn-sm btn-danger"> Delete selected elections diff --git a/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html b/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html index eefd1a54e..f0992620a 100644 --- a/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html +++ b/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html @@ -131,7 +131,7 @@ + class="btn btn-default btn-sm btn-danger"> Delete selected mediafiles diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index 61acf2481..1b1c18b5c 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -986,6 +986,9 @@ angular.module('OpenSlidesApp.motions.site', [ if ($scope.change_recommendations.length === 0) { $scope.setProjectionMode($scope.projectionModes[0]); } + if ($scope.change_recommendations.length > 0) { + $scope.inlineEditing.disable(); + } }); $scope.$watch(function () { return Projector.lastModified(); @@ -1570,6 +1573,12 @@ angular.module('OpenSlidesApp.motions.site', [ if (!motion.text) { motion.importerror = true; motion.text_error = gettext('Error: Text is required.'); + } else if (!motion.text.startsWith('

')) { + motion.text = '

' + motion.text + '

'; + } + // Reason + if (motion.reason && !motion.reason.startsWith('

')) { + motion.reason = '

' + motion.reason + '

'; } // submitter if (motion.submitter) { diff --git a/openslides/motions/static/templates/motions/motion-detail.html b/openslides/motions/static/templates/motions/motion-detail.html index 04ca36401..12ee27aaf 100644 --- a/openslides/motions/static/templates/motions/motion-detail.html +++ b/openslides/motions/static/templates/motions/motion-detail.html @@ -33,7 +33,7 @@ {{ mode.label | translate }} - ResolutionResolution
  • diff --git a/openslides/motions/static/templates/motions/motion-list.html b/openslides/motions/static/templates/motions/motion-list.html index 5920b51f8..92cb9363e 100644 --- a/openslides/motions/static/templates/motions/motion-list.html +++ b/openslides/motions/static/templates/motions/motion-list.html @@ -128,7 +128,7 @@ + class="btn btn-default btn-sm btn-danger"> Delete selected motions diff --git a/openslides/users/static/templates/users/user-list.html b/openslides/users/static/templates/users/user-list.html index 7baf1bd03..65c3b9526 100644 --- a/openslides/users/static/templates/users/user-list.html +++ b/openslides/users/static/templates/users/user-list.html @@ -79,7 +79,7 @@ + class="btn btn-default btn-sm btn-danger"> Delete selected participants