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

Merge pull request #3000 from emanuelschuetze/reject-change-recommendations

Browse Source 
Added 'reject all change recommendations' button.
This commit is contained in:
Norman Jäckel 2017-02-24 09:58:03 +01:00 committed by GitHub
commit bebdcaf6b9
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openslides/motions/static/js/motions/motion-services.js
View File

@ -467,6 +467,16 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions',
MotionChangeRecommendation.destroy(changeId);
};
obj.rejectAll = function (motion) {
var changeRecommendations = MotionChangeRecommendation.filter({
'where': {'motion_version_id': {'==': motion.active_version}}
});
_.forEach(changeRecommendations, function(change) {
change.rejected = true;
change.saveStatus();
});
};
obj.repositionOriginalAnnotations = function () {
var $changeRecommendationList = $('.change-recommendation-list'),
$lineNumberReference = $('.motion-text-original');

9
openslides/motions/static/templates/motions/motion-detail/change-summary.html
View File

@ -3,6 +3,14 @@
<strong>
<translate>Summary of change recommendations</translate>:
</strong>
<button class="btn btn-sm btn-default pull-right"
uib-tooltip="{{ 'Note: You have to reject all change recommendations if the plenum does not follow the recommendation.' | translate }}"
ng-click="viewChangeRecommendations.rejectAll(motion)">
<i class="fa fa-thumbs-down"></i>
<translate>Reject all change recommendations</translate>
</button>
<ul ng-if="change_recommendations.length > 0">
<li ng-repeat="change in (changes = (change_recommendations | filter:{motion_version_id:version}:true | orderBy: 'line_from')) ">
<a href='' ng-click="viewChangeRecommendations.scrollToDiffBox(change.id)">
@ -23,6 +31,7 @@
</a>
</li>
</ul>
<div ng-if="change_recommendations.length == 0" class="no-changes">
<translate>No change recommendations yet</translate>
</div>