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

Merge pull request #2076 from emanuelschuetze/fixes

Browse Source 
Last fixes for 2.0
This commit is contained in:
Norman Jäckel 2016-04-12 23:45:55 +02:00
commit 84eff37bdc
3 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/static/templates/agenda/item-sort.html
View File

@ -26,7 +26,7 @@
<script type="text/ng-template" id="nodes_renderer.html"> <script type="text/ng-template" id="nodes_renderer.html">
<div ui-tree-handle> <div ui-tree-handle>
<span ng-if="item.item.is_hidden">*</span> <span ng-if="item.item.is_hidden">*</span>
{{ item.item.getTitle() }} {{ item.item.getListViewTitle() }}
</div> </div>
<ol ui-tree-nodes="" ng-model="item.children"> <ol ui-tree-nodes="" ng-model="item.children">
<li ng-repeat="item in item.children" ui-tree-node ng-include="'nodes_renderer.html'"> <li ng-repeat="item in item.children" ui-tree-node ng-include="'nodes_renderer.html'">

64
openslides/assignments/static/templates/assignments/assignment-detail.html
View File

@ -75,39 +75,41 @@
<h3 translate>Description</h3> <h3 translate>Description</h3>
<div class="white-space-pre-line">{{ assignment.description }}</div> <div class="white-space-pre-line">{{ assignment.description }}</div>
<h3 translate>Candidates</h3> <div ng-if="assignment.phase != 2">
<ol> <h3 translate>Candidates</h3>
<li ng-repeat="related_user in assignment.assignment_related_users"> <ol>
<a ui-sref="users.user.detail({id: related_user.user_id})">{{ related_user.user.get_full_name() }}</a> <li ng-repeat="related_user in assignment.assignment_related_users">
<i ng-if="related_user.elected" class="fa fa-star" title="{{ 'is elected' | translate }}"></i> <a ui-sref="users.user.detail({id: related_user.user_id})">{{ related_user.user.get_full_name() }}</a>
<button os-perms="assignments.can_manage" ng-click="removeCandidate(related_user.user_id)" <i ng-if="related_user.elected" class="fa fa-star" title="{{ 'is elected' | translate }}"></i>
class="btn btn-default btn-xs"> <button os-perms="assignments.can_manage" ng-click="removeCandidate(related_user.user_id)"
<i class="fa fa-times"></i> class="btn btn-default btn-xs">
</button> <i class="fa fa-times"></i>
</ol> </button>
</ol>
<div class="form-group"> <div class="form-group">
<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 }}
</uib-alert> </uib-alert>
<div os-perms="assignments.can_nominate_other"> <div os-perms="assignments.can_nominate_other">
<select chosen ng-model="candidateSelectBox.selected" ng-change="addCandidate(candidateSelectBox.selected)" <select chosen ng-model="candidateSelectBox.selected" ng-change="addCandidate(candidateSelectBox.selected)"
ng-options="user.id as user.get_full_name() for user in users" ng-options="user.id as user.get_full_name() for user in users"
search-contains="true" search-contains="true"
placeholder-text-single="'Select or search a participant ...' | translate" placeholder-text-single="'Select or search a participant ...' | translate"
no-results-text="'No results available ...' | translate" no-results-text="'No results available ...' | translate"
class="form-control"> class="form-control">
<select> <select>
</div>
<p os-perms="assignments.can_nominate_self" class="spacer">
<button ng-if="!isCandidate()" ng-click="addMe()" class="btn btn-default">
<i class="fa fa-plus"></i>
<translate>Add me</translate>
</button>
<button ng-if="isCandidate()" ng-click="removeMe()" class="btn btn-default">
<i class="fa fa-minus"></i>
<translate>Remove me</translate>
</button>
</div> </div>
<p os-perms="assignments.can_nominate_self" class="spacer">
<button ng-if="!isCandidate()" ng-click="addMe()" class="btn btn-default">
<i class="fa fa-plus"></i>
<translate>Add me</translate>
</button>
<button ng-if="isCandidate()" ng-click="removeMe()" class="btn btn-default">
<i class="fa fa-minus"></i>
<translate>Remove me</translate>
</button>
</div> </div>
<h3 translate>Election result</h3> <h3 translate>Election result</h3>

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

@ -68,7 +68,7 @@ angular.module('OpenSlidesApp.motions', ['OpenSlidesApp.users'])
methods: { methods: {
// returns object with value and percent // returns object with value and percent
getVote: function (vote) { getVote: function (vote) {
if (!this.has_votes || !vote) { if (!this.has_votes) {
return; return;
} }
var value = ''; var value = '';