Merge pull request #3187 from FinnStutzenstein/Issue3186
Fixes #3060, fixes #3186.
This commit is contained in:
commit
cf9d204e18
@ -9,6 +9,8 @@ Version 2.2 (unreleased)
|
|||||||
|
|
||||||
Motions:
|
Motions:
|
||||||
- New export dialog.
|
- New export dialog.
|
||||||
|
- Fixed issue when creating/deleting motion comment fields in the settings.
|
||||||
|
|
||||||
|
|
||||||
Core:
|
Core:
|
||||||
- No reload on logoff. OpenSlides is now a full single page application.
|
- No reload on logoff. OpenSlides is now a full single page application.
|
||||||
|
@ -994,16 +994,16 @@ angular.module('OpenSlidesApp.core.site', [
|
|||||||
};
|
};
|
||||||
|
|
||||||
// For comments input
|
// For comments input
|
||||||
$scope.addComment = function (key, parent) {
|
$scope.addComment = function (configOption, parent) {
|
||||||
parent.value.push({
|
parent.value.push({
|
||||||
name: gettextCatalog.getString('New'),
|
name: gettextCatalog.getString('New'),
|
||||||
public: false,
|
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);
|
parent.value.splice(index, 1);
|
||||||
$scope.save(key, parent.value);
|
$scope.save(configOption, parent.value);
|
||||||
};
|
};
|
||||||
|
|
||||||
// For majority method
|
// For majority method
|
||||||
|
@ -34,14 +34,14 @@
|
|||||||
{{ (entry.public ? 'Public' : 'Private') | translate }}
|
{{ (entry.public ? 'Public' : 'Private') | translate }}
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-default"
|
<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>
|
<i class="fa fa-minus"></i>
|
||||||
<translate>Remove</translate>
|
<translate>Remove</translate>
|
||||||
</button>
|
</button>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<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">
|
class="btn btn-default btn-sm">
|
||||||
<i class="fa fa-plus"></i>
|
<i class="fa fa-plus"></i>
|
||||||
<translate>Add new comment field</translate>
|
<translate>Add new comment field</translate>
|
||||||
|
Loading…
Reference in New Issue
Block a user