Merge pull request openedx#6163 from open-craft/content_libraries/4-p…

…agination Implement Pagination for Content libraries (SOL-4)
open-craft · Dec 22, 2014 · fcc2045 · fcc2045
2 parents 6963e8e + be3371e
commit fcc2045
Show file tree

Hide file tree

Showing 28 changed files with 2,077 additions and 657 deletions.
diff --git a/cms/djangoapps/contentstore/views/item.py b/cms/djangoapps/contentstore/views/item.py
@@ -206,7 +206,7 @@ def xblock_view_handler(request, usage_key_string, view_name):
     if 'application/json' in accept_header:
         store = modulestore()
         xblock = store.get_item(usage_key)
-        container_views = ['container_preview', 'reorderable_container_child_preview']
+        container_views = ['container_preview', 'reorderable_container_child_preview', 'container_child_preview']
 
         # wrap the generated fragment in the xmodule_editor div so that the javascript
         # can bind to it correctly
@@ -238,12 +238,32 @@ def xblock_view_handler(request, usage_key_string, view_name):
             if view_name == 'reorderable_container_child_preview':
                 reorderable_items.add(xblock.location)
 
+            paging = None
+            try:
+                if request.REQUEST.get('enable_paging', 'false') == 'true':
+                    paging = {
+                        'page_number': int(request.REQUEST.get('page_number', 0)),
+                        'page_size': int(request.REQUEST.get('page_size', 0)),
+                    }
+            except ValueError:
+                return HttpResponse(
+                    content="Couldn't parse paging parameters: enable_paging: "
+                            "%s, page_number: %s, page_size: %s".format(
+                                request.REQUEST.get('enable_paging', 'false'),
+                                request.REQUEST.get('page_number', 0),
+                                request.REQUEST.get('page_size', 0)
+                            ),
+                    status=400,
+                    content_type="text/plain",
+                )
+
             # Set up the context to be passed to each XBlock's render method.
             context = {
                 'is_pages_view': is_pages_view,     # This setting disables the recursive wrapping of xblocks
                 'is_unit_page': is_unit(xblock),
                 'root_xblock': xblock if (view_name == 'container_preview') else None,
-                'reorderable_items': reorderable_items
+                'reorderable_items': reorderable_items,
+                'paging': paging,
             }
 
             fragment = get_preview_fragment(request, xblock, context)

diff --git a/cms/static/coffee/spec/main.coffee b/cms/static/coffee/spec/main.coffee
@@ -232,6 +232,7 @@ define([
     "js/spec/views/assets_spec",
     "js/spec/views/baseview_spec",
     "js/spec/views/container_spec",
+    "js/spec/views/paged_container_spec",
     "js/spec/views/group_configuration_spec",
     "js/spec/views/paging_spec",
     "js/spec/views/unit_outline_spec",

diff --git a/cms/static/js/factories/container.js b/cms/static/js/factories/container.js
@@ -1,22 +1,20 @@
 define([
-    'jquery', 'js/models/xblock_info', 'js/views/pages/container',
+    'jquery', 'underscore', 'js/models/xblock_info', 'js/views/pages/container',
     'js/collections/component_template', 'xmodule', 'coffee/src/main',
     'xblock/cms.runtime.v1'
 ],
-function($, XBlockInfo, ContainerPage, ComponentTemplates, xmoduleLoader) {
+function($, _, XBlockInfo, ContainerPage, ComponentTemplates, xmoduleLoader) {
     'use strict';
-    return function (componentTemplates, XBlockInfoJson, action, isUnitPage) {
-        var templates = new ComponentTemplates(componentTemplates, {parse: true}),
-            mainXBlockInfo = new XBlockInfo(XBlockInfoJson, {parse: true});
+    return function (componentTemplates, XBlockInfoJson, action, options) {
+        var main_options = {
+            el: $('#content'),
+            model: new XBlockInfo(XBlockInfoJson, {parse: true}),
+            action: action,
+            templates: new ComponentTemplates(componentTemplates, {parse: true})
+        };
 
         xmoduleLoader.done(function () {
-            var view = new ContainerPage({
-                el: $('#content'),
-                model: mainXBlockInfo,
-                action: action,
-                templates: templates,
-                isUnitPage: isUnitPage
-            });
+            var view = new ContainerPage(_.extend(main_options, options));
             view.render();
         });
     };

diff --git a/cms/static/js/factories/library.js b/cms/static/js/factories/library.js
@@ -1,22 +1,21 @@
 define([
-    'jquery', 'js/models/xblock_info', 'js/views/pages/container',
-    'js/collections/component_template', 'xmodule', 'coffee/src/main',
+    'jquery', 'underscore', 'js/models/xblock_info', 'js/views/pages/paged_container',
+    'js/views/library_container', 'js/collections/component_template', 'xmodule', 'coffee/src/main',
     'xblock/cms.runtime.v1'
 ],
-function($, XBlockInfo, ContainerPage, ComponentTemplates, xmoduleLoader) {
+function($, _, XBlockInfo, PagedContainerPage, LibraryContainerView, ComponentTemplates, xmoduleLoader) {
     'use strict';
-    return function (componentTemplates, XBlockInfoJson) {
-        var templates = new ComponentTemplates(componentTemplates, {parse: true}),
-            mainXBlockInfo = new XBlockInfo(XBlockInfoJson, {parse: true});
+    return function (componentTemplates, XBlockInfoJson, options) {
+        var main_options = {
+            el: $('#content'),
+            model: new XBlockInfo(XBlockInfoJson, {parse: true}),
+            templates: new ComponentTemplates(componentTemplates, {parse: true}),
+            action: 'view',
+            viewClass: LibraryContainerView
+        };
 
         xmoduleLoader.done(function () {
-            var view = new ContainerPage({
-                el: $('#content'),
-                model: mainXBlockInfo,
-                action: "view",
-                templates: templates,
-                isUnitPage: false
-            });
+            var view = new PagedContainerPage(_.extend(main_options, options));
             view.render();
         });
     };