Merge pull request #3187 from FinnStutzenstein/Issue3186

Fixes #3060, fixes #3186.
This commit is contained in:
Norman Jäckel 2017-04-07 16:47:42 +02:00 committed by GitHub
commit cf9d204e18
3 changed files with 8 additions and 6 deletions

View File

@ -9,6 +9,8 @@ Version 2.2 (unreleased)
Motions:
- New export dialog.
- Fixed issue when creating/deleting motion comment fields in the settings.
Core:
- No reload on logoff. OpenSlides is now a full single page application.

View File

@ -994,16 +994,16 @@ angular.module('OpenSlidesApp.core.site', [
};
// For comments input
$scope.addComment = function (key, parent) {
$scope.addComment = function (configOption, parent) {
parent.value.push({
name: gettextCatalog.getString('New'),
public: false,
});
$scope.save(key, parent.value);
$scope.save(configOption, parent.value);
};
$scope.removeComment = function (key, parent, index) {
$scope.removeComment = function (configOption, parent, index) {
parent.value.splice(index, 1);
$scope.save(key, parent.value);
$scope.save(configOption, parent.value);
};
// For majority method

View File

@ -34,14 +34,14 @@
{{ (entry.public ? 'Public' : 'Private') | translate }}
</button>
<button type="button" class="btn btn-default"
ng-click="removeComment(configOption.key, $parent, $index)">
ng-click="removeComment(configOption, $parent, $index)">
<i class="fa fa-minus"></i>
<translate>Remove</translate>
</button>
</span>
</div>
<div>
<button type="button" ng-click="addComment(configOption.key, $parent)"
<button type="button" ng-click="addComment(configOption, $parent)"
class="btn btn-default btn-sm">
<i class="fa fa-plus"></i>
<translate>Add new comment field</translate>