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

Merge pull request #3699 from FinnStutzenstein/attachmentsOrder

Browse Source 
Order attachments by title
This commit is contained in:
Emanuel Schütze 2018-04-13 10:00:48 +02:00 committed by GitHub
commit 384a7869ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openslides/motions/static/js/motions/site.js
View File

@ -354,6 +354,7 @@ angular.module('OpenSlidesApp.motions.site', [
// Service for generic motion form (create and update)
.factory('MotionForm', [
'$filter',
'gettextCatalog',
'operator',
'Editor',
@ -367,8 +368,8 @@ angular.module('OpenSlidesApp.motions.site', [
'Workflow',
'Agenda',
'AgendaTree',
function (gettextCatalog, operator, Editor, MotionComment, Category, Config, Mediafile, MotionBlock,
Tag, User, Workflow, Agenda, AgendaTree) {
function ($filter, gettextCatalog, operator, Editor, MotionComment, Category,
Config, Mediafile, MotionBlock, Tag, User, Workflow, Agenda, AgendaTree) {
return {
// ngDialog for motion form
getDialog: function (motion) {
@ -498,7 +499,7 @@ angular.module('OpenSlidesApp.motions.site', [
type: 'select-multiple',
templateOptions: {
label: gettextCatalog.getString('Attachment'),
options: Mediafile.getAll(),
options: $filter('orderBy')(Mediafile.getAll(), 'title_or_filename'),
ngOptions: 'option.id as option.title_or_filename for option in to.options',
placeholder: gettextCatalog.getString('Select or search an attachment ...')
},

5
openslides/topics/static/js/topics/site.js
View File

@ -61,13 +61,14 @@ angular.module('OpenSlidesApp.topics.site', ['OpenSlidesApp.topics', 'OpenSlides
])
.factory('TopicForm', [
'$filter',
'gettextCatalog',
'operator',
'Editor',
'Mediafile',
'Agenda',
'AgendaTree',
function (gettextCatalog, operator, Editor, Mediafile, Agenda, AgendaTree) {
function ($filter, gettextCatalog, operator, Editor, Mediafile, Agenda, AgendaTree) {
return {
// ngDialog for topic form
getDialog: function (topic) {
@ -110,7 +111,7 @@ angular.module('OpenSlidesApp.topics.site', ['OpenSlidesApp.topics', 'OpenSlides
type: 'select-multiple',
templateOptions: {
label: gettextCatalog.getString('Attachment'),
options: Mediafile.getAll(),
options: $filter('orderBy')(Mediafile.getAll(), 'title_or_filename'),
ngOptions: 'option.id as option.title_or_filename for option in to.options',
placeholder: gettextCatalog.getString('Select or search an attachment ...')
}

2
openslides/topics/static/templates/topics/topic-detail.html
View File

@ -30,7 +30,7 @@
<div ng-bind-html="topic.text | trusted" class="topictext"></div>
<h3 ng-if="topic.attachments.length > 0" translate>Attachments</h3>
<ul>
<li ng-repeat="attachment in topic.attachments">
<li ng-repeat="attachment in topic.attachments | orderBy: 'title_or_filename'">
<a href="{{ attachment.mediafileUrl }}" target="_blank">
{{ attachment.title_or_filename }}
</a>