Merge "Bug 1515484: The my views block on dashboard had broken pagination"

htdocs/artefact/blog/index.json.php

@@ -19,9 +19,11 @@ safe_require('artefact', 'blog');
 $blogs = (object) array(
     'offset' => param_integer('offset', 0),
     'limit'  => param_integer('limit', 10),
+    'institution' => param_alpha('institution', null),
+    'group'  => param_integer('group', null),
 );
 
-list($blogs->count, $blogs->data) = ArtefactTypeBlog::get_blog_list($blogs->limit, $blogs->offset);
+list($blogs->count, $blogs->data) = ArtefactTypeBlog::get_blog_list($blogs->limit, $blogs->offset, $blogs->institution, $blogs->group);
 ArtefactTypeBlog::build_blog_list_html($blogs);
 
 json_reply(false, array('data' => $blogs));

htdocs/artefact/blog/lib.php

@@ -406,6 +406,7 @@ class ArtefactTypeBlog extends ArtefactType {
             'count' => $blogs->count,
             'limit' => $blogs->limit,
             'offset' => $blogs->offset,
+            'setlimit' => true,
             'firsttext' => '',
             'previoustext' => '',
             'nexttext' => '',

htdocs/blocktype/myviews/myviews.json.php

@@ -31,11 +31,11 @@ $dashboard = new View($viewid);
 if (!can_view_view($dashboard)) {
     json_reply(true, get_string('accessdenied', 'error'));
 }
-$userid = $USER->get('id');
+
 $views = View::view_search(
         null, // $query
         null, // $ownerquery
-        (object) array('owner' => $userid), // $ownedby
+        (object) array('owner' => $dashboard->get('owner')), // $ownedby
         null, // $copyableby
         10, // $limit
         $offset, // $offset

htdocs/theme/raw/plugintype/artefact/blog/templates/index.tpl

@@ -8,9 +8,11 @@
 {if !$blogs->data}
 <p class="no-results">{str tag=youhavenoblogs section=artefact.blog}</p>
 {else}
-<div id="bloglist" class="rel view-container">
+<div class="rel view-container">
     <div class="panel-items js-masonry" data-masonry-options='{ "itemSelector": ".panel" }'>
-        {$blogs->tablerows|safe}
+        <div id="bloglist">
+            {$blogs->tablerows|safe}
+        </div>
     </div>
     {$blogs->pagination|safe}
 </div>