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'">

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

@ -75,6 +75,7 @@
<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>
<div ng-if="assignment.phase != 2">
<h3 translate>Candidates</h3> <h3 translate>Candidates</h3>
<ol> <ol>
<li ng-repeat="related_user in assignment.assignment_related_users"> <li ng-repeat="related_user in assignment.assignment_related_users">
@ -109,6 +110,7 @@
<translate>Remove me</translate> <translate>Remove me</translate>
</button> </button>
</div> </div>
</div>
<h3 translate>Election result</h3> <h3 translate>Election result</h3>
<button os-perms="assignments.can_manage" ng-click="createBallot()" class="btn btn-default btn-sm"> <button os-perms="assignments.can_manage" ng-click="createBallot()" class="btn btn-default btn-sm">

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 = '';