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

Merge pull request #1852 from normanjaeckel/AssignmentFixes

Browse Source 
Fixed several things in assignment app. See #1838.
This commit is contained in:
Oskar Hahn 2016-01-15 09:37:18 +01:00
commit ffe80e8da3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openslides/assignments/serializers.py
View File

@ -171,7 +171,8 @@ class AssignmentShortPollSerializer(AssignmentAllPollSerializer):
'options', 'options',
'votesvalid', 'votesvalid',
'votesinvalid', 'votesinvalid',
'votescast',) 'votescast',
'has_votes',)
class AssignmentFullSerializer(ModelSerializer): class AssignmentFullSerializer(ModelSerializer):

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

@ -73,7 +73,7 @@
</a> </a>
</span> </span>
</div> </div>
<p os-perm="assignments.can_nominate_self"> <p os-perms="assignments.can_nominate_self">
<button ng-if="!isCandidate()" ng-click="addMe()" class="btn btn-default"> <button ng-if="!isCandidate()" ng-click="addMe()" class="btn btn-default">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
<translate>Add me</translate> <translate>Add me</translate>
@ -91,7 +91,7 @@
</button> </button>
<uib-tabset class="spacer"> <uib-tabset class="spacer">
<uib-tab ng-repeat="poll in assignment.polls" heading="Ballot {{$index+1}}"> <uib-tab ng-repeat="poll in assignment.polls | orderBy:'-id'" heading="Ballot {{ assignment.polls.length - $index }}">
<div os-perms="assignments.can_manage" class="spacer"> <div os-perms="assignments.can_manage" class="spacer">
<!-- angular requires to open the link in new tab with "target='_blank'". <!-- angular requires to open the link in new tab with "target='_blank'".
Otherwise the pdf url can't be open in same window; angular redirects to "/". --> Otherwise the pdf url can't be open in same window; angular redirects to "/". -->