ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2562 from emanuelschuetze/comments-editor

Browse Source 
Use tinymce editor for motion comment fields.
This commit is contained in:
Norman Jäckel 2016-11-01 22:54:58 +01:00 committed by GitHub
commit 378fb46fb2
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openslides/motions/static/js/motions/base.js
View File

@ -444,7 +444,8 @@ angular.module('OpenSlidesApp.motions', [
.factory('MotionComment', [ .factory('MotionComment', [
'Config', 'Config',
'operator', 'operator',
function (Config, operator) { 'Editor',
function (Config, operator, Editor) {
return { return {
getFormFields: function () { getFormFields: function () {
var fields = Config.get('motions_comments').value; var fields = Config.get('motions_comments').value;
@ -453,10 +454,13 @@ angular.module('OpenSlidesApp.motions', [
function (field) { function (field) {
return { return {
key: 'comment ' + field.name, key: 'comment ' + field.name,
type: 'input', type: 'editor',
templateOptions: { templateOptions: {
label: field.name, label: field.name,
}, },
data: {
tinymceOption: Editor.getOptions()
},
hide: !operator.hasPerms("motions.can_see_and_manage_comments") hide: !operator.hasPerms("motions.can_see_and_manage_comments")
}; };
} }

11
openslides/motions/static/templates/motions/motion-detail.html
View File

@ -407,11 +407,12 @@
<div class="details" ng-if="isAllowedToSeeCommentField()"> <div class="details" ng-if="isAllowedToSeeCommentField()">
<h3>Motion Comments</h3> <h3>Motion Comments</h3>
<div ng-repeat="field in commentsFields"> <div ng-repeat="field in commentsFields">
<p ng-if="field.public || operator.hasPerms('motions.can_see_and_manage_comments')"> <div ng-if="field.public || operator.hasPerms('motions.can_see_and_manage_comments')">
<b>{{ field.name }}:</b> <h4>
{{ field.name }}
<span ng-if="!field.public" class="label label-warning" translate>internal</span> <span ng-if="!field.public" class="label label-warning" translate>internal</span>
<br> </h4>
{{ motion.comments[$index] }} <div ng-bind-html="motion.comments[$index]"></div>
</p> </div>
</div> </div>
</div> </div>