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

Review.

Browse Source
This commit is contained in:
Norman Jäckel 2016-08-25 13:39:00 +02:00
parent 6fba75c78b
commit 09aa2dea72
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/motions/static/js/motions/base.js
View File

@ -271,7 +271,7 @@ angular.module('OpenSlidesApp.motions', [
'motions/motionpoll': { 'motions/motionpoll': {
localField: 'polls', localField: 'polls',
foreignKey: 'motion_id', foreignKey: 'motion_id',
}, }
}, },
hasOne: { hasOne: {
'motions/workflowstate': { 'motions/workflowstate': {

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

@ -1084,6 +1084,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions', 'OpenSlid
// ... for amendments add parent_id // ... for amendments add parent_id
if (isAmendment) { if (isAmendment) {
if (Config.get('motions_amendments_apply_title_text').value) { if (Config.get('motions_amendments_apply_title_text').value) {
$scope.model.title = $scope.$parent.motion.getTitle();
$scope.model.text = $scope.$parent.motion.getText(); $scope.model.text = $scope.$parent.motion.getText();
} }
$scope.model.parent_id = $scope.$parent.motion.id; $scope.model.parent_id = $scope.$parent.motion.id;
@ -1665,6 +1666,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions', 'OpenSlid
gettext('Prefix for the identifier for amendments'); gettext('Prefix for the identifier for amendments');
/// Prefix for the identifier for amendments /// Prefix for the identifier for amendments
gettext('A'); gettext('A');
gettext('Apply title and text for new amendments');
// subgroup Suppoerters // subgroup Suppoerters
gettext('Supporters'); gettext('Supporters');

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

@ -81,7 +81,7 @@
<translate>Unsupport motion</translate> <translate>Unsupport motion</translate>
</button> </button>
</div> </div>
<!-- --> <!-- Amendments -->
<div ng-if="config('motions_amendments_enabled')"> <div ng-if="config('motions_amendments_enabled')">
<h3 translate>Amendments</h3> <h3 translate>Amendments</h3>
<div ng-repeat="amendment in amendments"> <div ng-repeat="amendment in amendments">

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

@ -1,6 +1,6 @@
<h1 ng-if="model.id" translate>Edit motion</h1> <h1 ng-if="model.id" translate>Edit motion</h1>
<h1 ng-if="!model.id && !parent" translate>New motion</h1> <h1 ng-if="!model.id && !parent" translate>New motion</h1>
<h1 ng-if="parent"><translate>New amendment of motion {{ parent.identifier || parent.getTitle() }}</translate></h1> <h1 ng-if="parent"><translate>New amendment of motion</translate> {{ parent.identifier || parent.getTitle() }}</h1>
<uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}"> <uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
{{ alert.msg }} {{ alert.msg }}