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

Merge pull request #2999 from emanuelschuetze/state-recommendation-name

Browse Source 
Added extension for state and recommendation names in dropdown.
This commit is contained in:
Emanuel Schütze 2017-02-22 21:52:41 +01:00 committed by GitHub
commit f69781b88b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,7 +138,10 @@
</span> </span>
<ul uib-dropdown-menu class="dropdown-menu" aria-labelledby="state-dropdown"> <ul uib-dropdown-menu class="dropdown-menu" aria-labelledby="state-dropdown">
<li ng-repeat="state in motion.state.getNextStates()"> <li ng-repeat="state in motion.state.getNextStates()">
<a href ng-click="updateState(state.id)">{{ state.action_word | translate }}</a> <a href ng-click="updateState(state.id)">
{{ state.action_word | translate }}
<span ng-if="state.show_state_extension_field">...</span>
</a>
<li class="divider" ng-if="motion.state.getNextStates().length && motion.isAllowed('reset_state')"> <li class="divider" ng-if="motion.state.getNextStates().length && motion.isAllowed('reset_state')">
<li ng-if="motion.isAllowed('reset_state')"> <li ng-if="motion.isAllowed('reset_state')">
<a href ng-click="reset_state()"> <a href ng-click="reset_state()">
@ -179,6 +182,7 @@
<li ng-repeat="recommendation in motion.state.getRecommendations()"> <li ng-repeat="recommendation in motion.state.getRecommendations()">
<a href ng-click="updateRecommendation(recommendation.id)"> <a href ng-click="updateRecommendation(recommendation.id)">
{{ recommendation.recommendation_label | translate }} {{ recommendation.recommendation_label | translate }}
<span ng-if="recommendation.show_recommendation_extension_field">...</span>
</a> </a>
<li class="divider" ng-if="motion.state.getRecommendations().length && motion.recommendation"> <li class="divider" ng-if="motion.state.getRecommendations().length && motion.recommendation">
<li ng-if="motion.recommendation"> <li ng-if="motion.recommendation">