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

Merge pull request #3612 from emanuelschuetze/fixAgendaImport

Browse Source 
Fixed agenda import with empty duration (fix #3603, fix #3601).
This commit is contained in:
Norman Jäckel 2018-03-04 20:58:23 +01:00 committed by GitHub
commit 2c266ffc03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,7 +309,7 @@ angular.module('OpenSlidesApp.topics.site', ['OpenSlidesApp.topics', 'OpenSlides
} }
item.duration = time; item.duration = time;
} else { } else {
item.duration = null; delete item.duration;
} }
// is_hidden // is_hidden
if (item.is_hidden) { if (item.is_hidden) {

4
openslides/topics/static/templates/topics/topic-import.html
View File

@ -92,7 +92,7 @@
</span> </span>
{{ item.title }} {{ item.title }}
<td>{{ item.text | limitTo:80 }}{{ item.text.length > 80 ? '...' : '' }} <td>{{ item.text | limitTo:80 }}{{ item.text.length > 80 ? '...' : '' }}
<td>{{ item.duration | osMinutesToTime }} <td>{{ item.duration ? 'item.duration | osMinutesToTime' : '' }}
<td>{{ item.comment }} <td>{{ item.comment }}
<td>{{ item.is_hidden }} <td>{{ item.is_hidden }}
</table> </table>
@ -100,7 +100,7 @@
<div class="text-danger"> <div class="text-danger">
<i class="fa fa-exclamation-triangle"></i> <i class="fa fa-exclamation-triangle"></i>
{{ itemsWillNMotBeImported }} {{ itemsWillNotBeImported }}
<translate>topics will be not imported.</translate> <translate>topics will be not imported.</translate>
</div> </div>
<div> <div>