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

Merge pull request #1832 from ostcar/fix_agenda_title

Browse Source 
Always use item.getTitle() instead of item.title
This commit is contained in:
Norman Jäckel 2016-01-10 11:26:44 +01:00
commit 8bdbdd0b07
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/static/templates/agenda/item-detail.html
View File

@ -20,7 +20,7 @@
<i class="fa fa-video-camera"></i> <i class="fa fa-video-camera"></i>
</a> </a>
</div> </div>
<h1>{{ item.title }}</h1> <h1>{{ item.getTitle() }}</h1>
<h2><translate>List of speakers</translate></h2> <h2><translate>List of speakers</translate></h2>
</div> </div>
</div> </div>

2
openslides/agenda/static/templates/agenda/item-import.html
View File

@ -99,7 +99,7 @@ Keep each item in a single line.</p>
<span ng-if="item.title_error" title="{{ item.title_error | translate }}"> <span ng-if="item.title_error" title="{{ item.title_error | translate }}">
<i class="fa fa-exclamation-triangle"></i> <i class="fa fa-exclamation-triangle"></i>
</span> </span>
{{ item.title }} {{ item.getTitle() }}
<td>{{ item.text | limitTo:80 }}{{ item.text.length > 80 ? '...' : '' }} <td>{{ item.text | limitTo:80 }}{{ item.text.length > 80 ? '...' : '' }}
</table> </table>

3
openslides/agenda/static/templates/agenda/item-sort.html
View File

@ -24,8 +24,7 @@
<!-- Nested node template --> <!-- Nested node template -->
<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>
{{ item.item.item_number }} {{ item.item.getTitle() }}
{{ item.item.title }}
</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/agenda/static/templates/agenda/slide-item-list.html
View File

@ -5,7 +5,7 @@
<!-- item type: AGENDA_ITEM = 1, HIDDEN_ITEM = 2 --> <!-- item type: AGENDA_ITEM = 1, HIDDEN_ITEM = 2 -->
<p ng-repeat="item in items | filter: {type: 1}" ng-class="{ 'spacer-top': !item.parent_id }"> <p ng-repeat="item in items | filter: {type: 1}" ng-class="{ 'spacer-top': !item.parent_id }">
<span ng-repeat="n in [].constructor(item.parentCount) track by $index">&nbsp;&nbsp;</span> <span ng-repeat="n in [].constructor(item.parentCount) track by $index">&nbsp;&nbsp;</span>
{{ item.title }} {{ item.getTitle() }}
<i ng-if="item.closed" class="fa fa-check"></i> <i ng-if="item.closed" class="fa fa-check"></i>
</p> </p>
</div> </div>