ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix pagination for external tools on settings page 

test plan:
 * Add 15 tools to an account
 * Should display all tools

Change-Id: Ia8f8b74aa90fa627ea7a7bea1b4aff2179c534d8
Reviewed-on: https://gerrit.instructure.com/21234
Reviewed-by: Eric Berry <ericb@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
Product-Review: Brad Humphrey <brad@instructure.com>
This commit is contained in:
Brad Humphrey 2013-06-05 13:19:16 -06:00
parent 649c5cb85b
commit 601f44a866
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/coffeescripts/bundles/external_tools.coffee
View File

@ -8,6 +8,7 @@ require [
# Collections
externalTools = new ExternalToolCollection
externalTools.setParam('per_page', 20)
apps = new PaginatedCollection
apps.resourceName = 'app_center/apps'

6
app/coffeescripts/views/ExternalTools/ExternalToolsCollectionView.coffee
View File

@ -3,11 +3,11 @@ define [
'str/htmlEscape'
'jst/ExternalTools/ExternalToolsCollectionView'
'compiled/views/ExternalTools/ExternalToolView'
'compiled/views/CollectionView'
'compiled/views/PaginatedCollectionView'
'i18n!external_tools'
], ($, htmlEscape, template, ExternalToolView, CollectionView, I18n) ->
], ($, htmlEscape, template, ExternalToolView, PaginatedCollectionView, I18n) ->
class ExternalToolsCollectionView extends CollectionView
class ExternalToolsCollectionView extends PaginatedCollectionView
template: template
itemView: ExternalToolView

2
app/views/jst/ExternalTools/AppCenterView.handlebars
View File

@ -1,6 +1,6 @@
<div class="app_center">
<div class="app_list">
<div class="collectionViewItems clearfix"></div>
<div class="paginatedLoadingIndicator"></div>
<div class="paginatedLoadingIndicator" style="display: none"></div>
</div>
</div>

3
app/views/jst/ExternalTools/ExternalToolsCollectionView.handlebars
View File

@ -7,4 +7,5 @@
</tr>
</thead>
<tbody class="collectionViewItems"></tbody>
</table>
</table>
<div class="paginatedLoadingIndicator" style="display: none"></div>

1
app/views/jst/ExternalTools/IndexView.handlebars
View File

@ -20,4 +20,3 @@
<div data-view="appCenter"></div>
<div data-view="externalTools"></div>
<div data-view="appFull"></div>
<form data-view="addApp" class="form-dialog"></form>