diff --git a/CHANGELOG b/CHANGELOG index 50e432b23..6f03b57e4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -58,6 +58,7 @@ Motions: - Number of ballots printed can now be set in config. - Add new personal settings to remove all whitespaces from motion identifier. - Add new personal settings to allow amendments of amendments. +- Added inline editing for comments. Elections: - Added options to calculate percentages on different bases. diff --git a/openslides/motions/static/js/motions/motion-services.js b/openslides/motions/static/js/motions/motion-services.js index 7b6059b63..30a83d55c 100644 --- a/openslides/motions/static/js/motions/motion-services.js +++ b/openslides/motions/static/js/motions/motion-services.js @@ -59,125 +59,180 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions', .factory('MotionInlineEditing', [ 'Editor', 'Motion', - 'Config', '$timeout', 'gettextCatalog', - function (Editor, Motion, Config, $timeout, gettextCatalog) { - var obj = { - active: false, - changed: false, - trivialChange: false, - originalHtml: null - }; - - var $scope, motion; - - obj.init = function (_scope, _motion) { - $scope = _scope; - motion = _motion; - obj.ckeditorOptions = Editor.getOptions(); + function (Editor, Motion, $timeout, gettextCatalog) { + var createInstance = function ($scope, motion, selector, versioning, getOriginalData, saveData) { + var obj = { + active: false, + changed: false, + isEditable: false, + trivialChange: false, + originalHtml: null, + ckeditorOptions: Editor.getOptions(), + }; obj.ckeditorOptions.readOnly = true; - obj.isEditable = false; - obj.changed = false; - }; - obj.setVersion = function (_motion, versionId) { - motion = _motion; // If this is not updated, - obj.originalHtml = motion.getTextWithLineBreaks(versionId); - obj.changed = false; - obj.editor.setReadOnly(true); - if (obj.editor) { - obj.editor.setData(obj.originalHtml); - } - }; + obj.setVersion = function (_motion, versionId) { + motion = _motion; // If this is not updated, + obj.originalHtml = motion.getTextWithLineBreaks(versionId); + obj.changed = false; + obj.editor.setReadOnly(true); + if (obj.editor) { + obj.editor.setData(obj.originalHtml); + } + }; - obj.enable = function () { - if (motion.isAllowed('update')) { - obj.active = true; - obj.isEditable = true; - obj.ckeditorOptions.language = gettextCatalog.getCurrentLanguage(); - obj.editor = CKEDITOR.inline('view-original-inline-editor', obj.ckeditorOptions); - obj.editor.on('change', function () { - $timeout(function() { - if (obj.editor.getData() != obj.originalHtml) { - obj.changed = true; - } else { - obj.changed = false; + obj.enable = function () { + if (motion.isAllowed('update')) { + obj.active = true; + obj.isEditable = true; + obj.ckeditorOptions.language = gettextCatalog.getCurrentLanguage(); + obj.editor = CKEDITOR.inline(selector, obj.ckeditorOptions); + obj.editor.on('change', function () { + $timeout(function() { + if (obj.editor.getData() != obj.originalHtml) { + obj.changed = true; + } else { + obj.changed = false; + } + }); + }); + obj.revert(); + } else { + obj.disable(); + } + }; + + obj.disable = function () { + if (obj.editor) { + obj.editor.setReadOnly(true); + obj.editor.setData(obj.originalHtml, { + callback: function() { + obj.editor.destroy(); } }); - }); - obj.revert(); - } else { - obj.disable(); - } - }; - - obj.disable = function () { - if (obj.editor) { - obj.editor.setReadOnly(true); - obj.editor.setData(obj.originalHtml, { - callback: function() { - obj.editor.destroy(); - } - }); - } - $timeout(function() { - obj.active = false; - obj.changed = false; - obj.isEditable = false; - }); - }; - - // sets editor content to the initial motion state - obj.revert = function() { - if (obj.editor) { - obj.originalHtml = motion.getTextWithLineBreaks($scope.version); - obj.editor.setData( - motion.getTextWithLineBreaks($scope.version), { - callback: function() { - obj.originalHtml = obj.editor.getData(); - obj.editor.setReadOnly(false); - $timeout(function() { - obj.changed = false; - }); - $timeout(function () { - obj.editor.focus(); - }, 100); - } - }); - } - }; - - obj.save = function () { - if (!motion.isAllowed('update')) { - throw 'No permission to update motion'; - } - - motion.setTextStrippingLineBreaks(obj.editor.getData()); - motion.disable_versioning = (obj.trivialChange && Config.get('motions_allow_disable_versioning').value); - - Motion.inject(motion); - // save change motion object on server - Motion.save(motion, {method: 'PATCH'}).then( - function (success) { - $scope.showVersion(motion.getVersion(-1)); - obj.revert(); - }, - function (error) { - // save error: revert all changes by restore - // (refresh) original motion object from server - Motion.refresh(motion); - obj.revert(); - var message = ''; - for (var e in error.data) { - message += e + ': ' + error.data[e] + ' '; - } - $scope.alert = {type: 'danger', msg: message, show: true}; } - ); - }; + $timeout(function() { + obj.active = false; + obj.changed = false; + obj.isEditable = false; + }); + }; - return obj; + // sets editor content to the initial motion state + obj.revert = function(originalData) { + if (obj.editor) { + obj.originalHtml = getOriginalData(obj); + obj.editor.setData( + getOriginalData(obj), { + callback: function() { + obj.originalHtml = obj.editor.getData(); + obj.editor.setReadOnly(false); + $timeout(function() { + obj.changed = false; + }); + $timeout(function () { + obj.editor.focus(); + }, 100); + } + }); + } + }; + + obj.save = function () { + if (!motion.isAllowed('update')) { + throw 'No permission to update motion'; + } + + saveData(obj); + + Motion.inject(motion); + // save change motion object on server + Motion.save(motion, {method: 'PATCH'}).then( + function (success) { + if (versioning) { + $scope.showVersion(motion.getVersion(-1)); + } + obj.revert(); + }, + function (error) { + // save error: revert all changes by restore + // (refresh) original motion object from server + Motion.refresh(motion); + obj.revert(); + var message = ''; + for (var e in error.data) { + message += e + ': ' + error.data[e] + ' '; + } + $scope.alert = {type: 'danger', msg: message, show: true}; + } + ); + }; + + return obj; + }; + return { + createInstance: createInstance + }; + } +]) + +.factory('MotionCommentsInlineEditing', [ + 'MotionInlineEditing', + function (MotionInlineEditing) { + var createInstances = function ($scope, motion) { + var commentsInlineEditing = { + editors: [] + }; + _.forEach($scope.commentsFields, function (field) { + var inlineEditing = MotionInlineEditing.createInstance($scope, motion, + 'view-original-comment-inline-editor-' + field.name, false, + function (obj) { + return motion['comment ' + field.name]; + }, + function (obj) { + motion['comment ' + field.name] = obj.editor.getData(); + } + ); + commentsInlineEditing.editors.push(inlineEditing); + }); + commentsInlineEditing.saveToolbarVisible = function () { + return _.some(commentsInlineEditing.editors, function (instance) { + return instance.changed && instance.active; + }); + }; + commentsInlineEditing.active = function () { + return _.some(commentsInlineEditing.editors, function (instance) { + return instance.active; + }); + }; + commentsInlineEditing.save = function () { + _.forEach(commentsInlineEditing.editors, function (instance) { + instance.save(); + }); + }; + commentsInlineEditing.revert = function () { + _.forEach(commentsInlineEditing.editors, function (instance) { + instance.revert(); + }); + }; + commentsInlineEditing.enable = function () { + _.forEach(commentsInlineEditing.editors, function (instance) { + instance.enable(); + }); + }; + commentsInlineEditing.disable = function () { + _.forEach(commentsInlineEditing.editors, function (instance) { + instance.disable(); + }); + }; + + return commentsInlineEditing; + }; + return { + createInstances: createInstances, + }; } ]) diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index b668e7437..1887c83f0 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -1100,12 +1100,13 @@ angular.module('OpenSlidesApp.motions.site', [ 'Config', 'motion', 'MotionInlineEditing', + 'MotionCommentsInlineEditing', 'Projector', 'ProjectionDefault', function($scope, $http, operator, ngDialog, MotionForm, ChangeRecommmendationCreate, ChangeRecommmendationView, MotionChangeRecommendation, MotionPDFExport, Motion, MotionComment, Category, Mediafile, Tag, User, Workflow, Config, motion, MotionInlineEditing, - Projector, ProjectionDefault) { + MotionCommentsInlineEditing, Projector, ProjectionDefault) { Category.bindAll({}, $scope, 'categories'); Mediafile.bindAll({}, $scope, 'mediafiles'); Tag.bindAll({}, $scope, 'tags'); @@ -1345,8 +1346,17 @@ angular.module('OpenSlidesApp.motions.site', [ }; // Inline editing functions - $scope.inlineEditing = MotionInlineEditing; - $scope.inlineEditing.init($scope, motion); + $scope.inlineEditing = MotionInlineEditing.createInstance($scope, motion, + 'view-original-text-inline-editor', true, + function (obj) { + return motion.getTextWithLineBreaks($scope.version); + }, + function (obj) { + motion.setTextStrippingLineBreaks(obj.editor.getData()); + motion.disable_versioning = (obj.trivialChange && Config.get('motions_allow_disable_versioning').value); + } + ); + $scope.commentsInlineEditing = MotionCommentsInlineEditing.createInstances($scope, motion); // Change recommendation creation functions $scope.createChangeRecommendation = ChangeRecommmendationCreate; diff --git a/openslides/motions/static/templates/motions/motion-detail.html b/openslides/motions/static/templates/motions/motion-detail.html index 53394260f..62dff7919 100644 --- a/openslides/motions/static/templates/motions/motion-detail.html +++ b/openslides/motions/static/templates/motions/motion-detail.html @@ -485,16 +485,5 @@ -
-

Comments

-
-
-

- {{ field.name }} - internal -

-
-
-
-
+ + diff --git a/openslides/motions/static/templates/motions/motion-detail/comments.html b/openslides/motions/static/templates/motions/motion-detail/comments.html new file mode 100644 index 000000000..43ee35f1d --- /dev/null +++ b/openslides/motions/static/templates/motions/motion-detail/comments.html @@ -0,0 +1,45 @@ +
+
+ +
+
+ + +
+

Comments

+
+ +
+
+
+

+ {{ field.name }} + internal +

+
+
+
+ +
+
The comments have been changed.
+
The comment has been changed.
+ + +
+
+
+
diff --git a/openslides/motions/static/templates/motions/motion-detail/view-original.html b/openslides/motions/static/templates/motions/motion-detail/view-original.html index 790a8fc84..07c8001ac 100644 --- a/openslides/motions/static/templates/motions/motion-detail/view-original.html +++ b/openslides/motions/static/templates/motions/motion-detail/view-original.html @@ -1,8 +1,8 @@
-
+ contenteditable="{{ inlineEditing.isEditable }}">
The text has been changed.