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

Fixed switching between motion versions (Fixed #2363)

Browse Source 
- Show correct text and reason for selected version.
- Disable inline editing after save (otherwise inline mode is still
  active when user change version)
This commit is contained in:
Emanuel Schütze 2017-03-03 17:00:20 +01:00
parent 95c19159f8
commit 3903be5d6b
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions',
}); });
$http.post('/core/encode_media/', JSON.stringify(image_sources)).then(function (success) { $http.post('/core/encode_media/', JSON.stringify(image_sources)).then(function (success) {
var converter = PdfMakeConverter.createInstance(sucess.data.images); var converter = PdfMakeConverter.createInstance(success.data.images);
var motionContentProvider = MotionContentProvider.createInstance(converter, $scope.motion, $scope, User, $http); var motionContentProvider = MotionContentProvider.createInstance(converter, $scope.motion, $scope, User, $http);
var documentProvider = PdfMakeDocumentProvider.createInstance(motionContentProvider); var documentProvider = PdfMakeDocumentProvider.createInstance(motionContentProvider);
var identifier = $scope.motion.identifier ? '-' + $scope.motion.identifier : ''; var identifier = $scope.motion.identifier ? '-' + $scope.motion.identifier : '';
@ -148,6 +148,7 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions',
} }
saveData(obj); saveData(obj);
obj.disable();
Motion.inject(motion); Motion.inject(motion);
// save change motion object on server // save change motion object on server

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

@ -477,7 +477,7 @@
<!-- reason --> <!-- reason -->
<div ng-if="motion.getReason(version) != ''"> <div ng-if="motion.getReason(version) != ''">
<h3 translate>Reason</h3> <h3 translate>Reason</h3>
<div ng-bind-html="motion.getReason() | trusted"></div> <div ng-bind-html="motion.getReason(version) | trusted"></div>
</div> </div>
<!-- attachments --> <!-- attachments -->

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

@ -1,5 +1,5 @@
<!-- Original view --> <!-- Original view -->
<div ng-if="viewChangeRecommendations.mode == 'original' && version == motion.getVersion(-1).id"> <div ng-if="viewChangeRecommendations.mode == 'original'">
<div id="view-original-text-inline-editor" ng-bind-html="motion.getTextWithLineBreaks(version, highlight) | trusted" <div id="view-original-text-inline-editor" ng-bind-html="motion.getTextWithLineBreaks(version, highlight) | trusted"
class="motion-text motion-text-original line-numbers-{{ lineNumberMode }}" class="motion-text motion-text-original line-numbers-{{ lineNumberMode }}"
contenteditable="{{ inlineEditing.isEditable }}"> contenteditable="{{ inlineEditing.isEditable }}">