Bug #1050292: Fix pagination for viewing blogpost artefacts

When not in a block (ie viewing one individual artefact) the
blockid was appended to the container, this should be removed
when not in block context

Change-Id: I7c131b761ee8c1006164eb6c918bb67b5e785171
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

htdocs/artefact/blog/posts.json.php

@@ -65,7 +65,10 @@ else {
     if (!can_view_view($viewid)) {
         json_reply(true, get_string('accessdenied', 'error'));
     }
-    $options = array('viewid' => $viewid);
+    $options = array(
+        'viewid' => $viewid,
+        'countcomments' => true,
+    );
     $posts = ArtefactTypeBlogpost::get_posts($blogid, $limit, $offset, $options);
 
     $template = 'artefact:blog:viewposts.tpl';

htdocs/artefact/blog/theme/raw/blog.tpl

@@ -10,19 +10,19 @@
 <div id="blogdescription">{$description|clean_html|safe}
 {if $tags}<p class="tags s"><label>{str tag=tags}:</label> {list_tags owner=$owner tags=$tags}</p>{/if}
 </div>
-<table id="postlist_{$blockid}" class="postlist">
+<table id="postlist{if $blockid}_{$blockid}{/if}" class="postlist">
   <tbody>
   {$posts.tablerows|safe}
   </tbody>
 </table>
 {if $posts.pagination}
-<div id="blogpost_page_container_{$blockid}" class="hidden center">{$posts.pagination|safe}</div>
+<div id="blogpost_page_container{if $blockid}_{$blockid}{/if}" class="hidden center">{$posts.pagination|safe}</div>
 {/if}
 {if $posts.pagination_js}
 <script>
 addLoadEvent(function() {literal}{{/literal}
     {$posts.pagination_js|safe}
-    removeElementClass('blogpost_page_container_{$blockid}', 'hidden');
+    removeElementClass('blogpost_page_container{if $blockid}_{$blockid}{/if}', 'hidden');
 {literal}}{/literal});
 </script>
 {/if}