Minor fixes (Fixes #2750)
- Use <ul> instead of <ol> for candidate lists. - Fix sorting by assignment_related_users.length in list view (Fixes #2750). - Apply category and motion block for new amendments.
This commit is contained in:
parent
5cc820d6d2
commit
8780c47fc1
@ -80,7 +80,7 @@ angular.module('OpenSlidesApp.assignments.pdf', ['OpenSlidesApp.core.pdf'])
|
||||
style: 'textItem'
|
||||
},
|
||||
{
|
||||
ol: userList,
|
||||
ul: userList,
|
||||
style: 'textItem'
|
||||
}
|
||||
]
|
||||
|
@ -22,7 +22,7 @@ angular.module('OpenSlidesApp.assignments.projector', ['OpenSlidesApp.assignment
|
||||
// Add it to the coresponding get_requirements method of the ProjectorElement
|
||||
// class.
|
||||
var id = $scope.element.id;
|
||||
var poll = $scope.element.poll;
|
||||
$scope.showResult = $scope.element.poll;
|
||||
|
||||
Assignment.bindOne(id, $scope, 'assignment');
|
||||
Assignment.getPhases().then(function(phases) {
|
||||
|
@ -361,7 +361,7 @@ angular.module('OpenSlidesApp.assignments.site', [
|
||||
display_name: gettext('Title')},
|
||||
{name: 'phase',
|
||||
display_name: gettext('Phase')},
|
||||
{name: 'assignment.assignment_related_users.length',
|
||||
{name: 'assignment_related_users.length',
|
||||
display_name: gettext('Number of candidates')},
|
||||
];
|
||||
$scope.hasTag = function (assignment, tag) {
|
||||
|
@ -82,7 +82,7 @@
|
||||
|
||||
<div ng-if="assignment.phase != 2">
|
||||
<h3 translate>Candidates</h3>
|
||||
<ol>
|
||||
<ul>
|
||||
<li ng-repeat="related_user in assignment.assignment_related_users">
|
||||
<a ui-sref="users.user.detail({id: related_user.user_id})">{{ related_user.user.get_full_name() }}</a>
|
||||
<i ng-if="related_user.elected" class="fa fa-star" title="{{ 'is elected' | translate }}"></i>
|
||||
@ -90,7 +90,7 @@
|
||||
class="btn btn-default btn-xs">
|
||||
<i class="fa fa-times"></i>
|
||||
</button>
|
||||
</ol>
|
||||
</ul>
|
||||
|
||||
<div class="form-group">
|
||||
<div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" ng-click="alert={}" close="alert={}">
|
||||
|
@ -9,22 +9,22 @@
|
||||
</div>
|
||||
|
||||
<!-- Description -->
|
||||
<div ng-hide="element.poll" class="white-space-pre-line">
|
||||
<div ng-if="!showResult && assignment.description !== ''" class="white-space-pre-line">
|
||||
{{ assignment.description }}
|
||||
</div>
|
||||
|
||||
<!-- Candidates -->
|
||||
<div ng-hide="element.poll">
|
||||
<div ng-if="!showResult">
|
||||
<h3 translate>Candidates</h3>
|
||||
<ol>
|
||||
<ul>
|
||||
<li ng-repeat="related_user in assignment.assignment_related_users">
|
||||
{{ related_user.user.get_full_name() }}
|
||||
<i ng-if="related_user.elected" class="fa fa-star" title="{{ 'is elected' | translate }}"></i>
|
||||
</ol>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<!-- vote results -->
|
||||
<div ng-show="element.poll" class="electionresults spacer" ng-repeat="poll in assignment.polls | filter: {id: element.poll}">
|
||||
<div ng-show="showResult" class="electionresults spacer" ng-repeat="poll in assignment.polls | filter: {id: element.poll}">
|
||||
<table class="table table-bordered table-striped minimumTable">
|
||||
<tr>
|
||||
<th translate>Candidates
|
||||
|
@ -370,7 +370,7 @@ img {
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
.col1 ol {
|
||||
.col1 ol, .col1 ul {
|
||||
margin-left: 15px;
|
||||
}
|
||||
.ballot-tabs ul {
|
||||
@ -437,10 +437,6 @@ img {
|
||||
.motion-text .highlight {
|
||||
background-color: #ff0;
|
||||
}
|
||||
|
||||
.motion-text li {
|
||||
margin-left: 30px;
|
||||
}
|
||||
.motion-text ins {
|
||||
color: green;
|
||||
text-decoration: underline;
|
||||
|
@ -1405,6 +1405,8 @@ angular.module('OpenSlidesApp.motions.site', [
|
||||
}
|
||||
$scope.model.title = $scope.$parent.motion.getTitle();
|
||||
$scope.model.parent_id = $scope.$parent.motion.id;
|
||||
$scope.model.category_id = $scope.$parent.motion.category_id;
|
||||
$scope.model.motion_block_id = $scope.$parent.motion.motion_block_id;
|
||||
Motion.bindOne($scope.model.parent_id, $scope, 'parent');
|
||||
}
|
||||
// ... preselect default workflow
|
||||
|
Loading…
Reference in New Issue
Block a user