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

Merge pull request #3461 from FinnStutzenstein/followRecommendationAutoCopy

Browse Source 
Update state field when following a recommendation
This commit is contained in:
Norman Jäckel 2017-10-29 17:53:30 +01:00 committed by GitHub
commit e259e10202
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openslides/motions/static/js/motions/site.js
View File

@ -1372,6 +1372,11 @@ angular.module('OpenSlidesApp.motions.site', [
dialog.scope = $scope; dialog.scope = $scope;
ngDialog.open(dialog); ngDialog.open(dialog);
}; };
// follow recommendation
$scope.followRecommendation = function () {
$scope.updateState($scope.motion.recommendation.id);
$scope.saveAdditionalStateField($scope.recommendationExtension);
};
// update state // update state
$scope.updateState = function (state_id) { $scope.updateState = function (state_id) {
$http.put('/rest/motions/motion/' + motion.id + '/set_state/', {'state': state_id}); $http.put('/rest/motions/motion/' + motion.id + '/set_state/', {'state': state_id});

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

@ -219,7 +219,7 @@
ng-if="motion.recommendation && ng-if="motion.recommendation &&
motion.isAllowed('change_state') && motion.isAllowed('change_state') &&
motion.state.next_states_id.indexOf(motion.recommendation.id) !== -1" motion.state.next_states_id.indexOf(motion.recommendation.id) !== -1"
ng-click="updateState(motion.recommendation.id)" ng-click="followRecommendation()"
class="btn btn-default btn-sm"> class="btn btn-default btn-sm">
<i class="fa fa-magic"></i> <i class="fa fa-magic"></i>
<translate>Follow recommendation</translate> <translate>Follow recommendation</translate>