Merge pull request #3194 from emanuelschuetze/motionCommentFix

Fixed empty motion comment field in motion update form.
This commit is contained in:
Emanuel Schütze 2017-04-11 17:19:14 +02:00 committed by GitHub
commit 34c7b51159
2 changed files with 4 additions and 1 deletions

View File

@ -14,6 +14,7 @@ Motions:
- New export dialog [#3185].
- Fixed issue when creating/deleting motion comment fields in the
settings [#3187].
- Fixed empty motion comment field in motion update form [#3194].
Core:
- No reload on logoff. OpenSlides is now a full single page

View File

@ -838,6 +838,7 @@ angular.module('OpenSlidesApp.motions.site', [
'ngDialog',
'MotionForm',
'Motion',
'MotionComment',
'Category',
'Config',
'Tag',
@ -851,7 +852,7 @@ angular.module('OpenSlidesApp.motions.site', [
'osTableSort',
'MotionExportForm',
'MotionPdfExport',
function($scope, $state, $http, gettext, gettextCatalog, ngDialog, MotionForm, Motion,
function($scope, $state, $http, gettext, gettextCatalog, ngDialog, MotionForm, Motion, MotionComment,
Category, Config, Tag, Workflow, User, Agenda, MotionBlock, Projector,
ProjectionDefault, osTableFilter, osTableSort, MotionExportForm, MotionPdfExport) {
Motion.bindAll({}, $scope, 'motions');
@ -1045,6 +1046,7 @@ angular.module('OpenSlidesApp.motions.site', [
// open new/edit dialog
$scope.openDialog = function (motion) {
MotionComment.populateFields(motion);
ngDialog.open(MotionForm.getDialog(motion));
};
// Export dialog