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

Merge pull request #3514 from emanuelschuetze/assignmentHTMLFix

Browse Source 
Remove HTML tags from description in assignment PDF.
This commit is contained in:
Emanuel Schütze 2017-12-15 09:18:54 +01:00 committed by GitHub
commit b3a71a741f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/assignments/static/js/assignments/pdf.js
View File

@ -47,7 +47,7 @@ angular.module('OpenSlidesApp.assignments.pdf', ['OpenSlidesApp.core.pdf'])
style: 'textItem' style: 'textItem'
}, },
{ {
text: assignment.description, text: $(assignment.description).text(),
style: 'textItem', style: 'textItem',
margin: [10, 0, 0, 0] margin: [10, 0, 0, 0]
} }

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

@ -75,12 +75,12 @@
</div> </div>
<div class="details"> <div class="details">
<div ng-if="assignment.description"> <div ng-if="assignment.description" class="clearfix">
<h3 translate>Description</h3> <h3 translate>Description</h3>
<div ng-bind-html="assignment.description | trusted"></div> <div ng-bind-html="assignment.description | trusted"></div>
</div> </div>
<div ng-if="assignment.phase !== 2" class="clearfix"> <div ng-if="assignment.phase !== 2">
<h3 translate>Candidates</h3> <h3 translate>Candidates</h3>
<div ui-tree="treeOptions" ng-if="assignment.assignment_related_users.length" <div ui-tree="treeOptions" ng-if="assignment.assignment_related_users.length"
data-empty-placeholder-enabled="false"> data-empty-placeholder-enabled="false">

4
openslides/assignments/static/templates/assignments/slide_assignment.html
View File

@ -11,11 +11,11 @@
<!-- Description --> <!-- Description -->
<div ng-if="!showResult && assignment.description !== ''" <div ng-if="!showResult && assignment.description !== ''"
ng-bind-html="assignment.description | trusted" ng-bind-html="assignment.description | trusted"
class="zoomcontent"> class="zoomcontent clearfix">
</div> </div>
<!-- Candidates --> <!-- Candidates -->
<div class="zoomcontent" ng-if="!showResult" class="clearfix"> <div class="zoomcontent" ng-if="!showResult">
<h3 translate>Candidates</h3> <h3 translate>Candidates</h3>
<ul> <ul>
<li ng-repeat="related_user in assignment.assignment_related_users | orderBy:'weight'"> <li ng-repeat="related_user in assignment.assignment_related_users | orderBy:'weight'">