fix scaffold showall & showall_by_tags view to allow pagination

exponentcms · Aug 23, 2016 · 9cbc9f6 · 9cbc9f6
1 parent a99b773
commit 9cbc9f6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/framework/modules/common/views/scaffold/showall.tpl b/framework/modules/common/views/scaffold/showall.tpl
@@ -26,26 +26,29 @@
         </div>
     {/permissions}
 	<ul>
-        {foreach from=$page->records item=listing}
+        {*{foreach from=$page->records item=listing}*}
+		{pagelinks paginate=$page top=1}
+	    {foreach from=$page->records item=item}
 		<li class="item listing">
 			<h3>
-				<a href="{link controller=$controller action=show id=$listing->id}">{$listing->title}</a>
+				<a href="{link controller=$controller action=show id=$item->id}">{$item->title}</a>
 				{permissions}
 					<div class="item-actions">
-						{if $permissions.edit || ($permissions.create && $listing->poster == $user->id)}
-							{icon controller=$controller action=edit record=$listing}
+						{if $permissions.edit || ($permissions.create && $item->poster == $user->id)}
+							{icon controller=$controller action=edit record=$item}
 						{/if}
-						{if $permissions.delete || ($permissions.create && $listing->poster == $user->id)}
-							{icon controller=$controller action=delete record=$listing}
+						{if $permissions.delete || ($permissions.create && $item->poster == $user->id)}
+							{icon controller=$controller action=delete record=$item}
 						{/if}
 					</div>
 				{/permissions}
 			</h3>
             <div class="bodycopy">
-    			<p>{$listing->body}</p>
+    			<p>{$item->body}</p>
             </div>
 			{clear}
 		</li>
         {/foreach}
+		{pagelinks paginate=$page bottom=1}
 	</ul>
 </div>
diff --git a/framework/modules/common/views/scaffold/showall_by_tags.tpl b/framework/modules/common/views/scaffold/showall_by_tags.tpl
@@ -27,24 +27,27 @@
 		</div>
     {/permissions}
 	<ul>
-        {foreach from=$items item=listing}
+        {*{foreach from=$items item=listing}*}
+		{pagelinks paginate=$page top=1}
+	    {foreach from=$page->records item=item}
 		<li class="item listing">
-			<h3><a href="{link controller=$controller action=show id=$listing->id}">{$listing->title}</a></h3>
+			<h3><a href="{link controller=$controller action=show id=$item->id}">{$item->title}</a></h3>
             <div class="bodycopy">
-                <p>{$listing->body}</p>
+                <p>{$item->body}</p>
             </div>
 			{permissions}
 				<div class="item-actions">
-					{if $permissions.edit || ($permissions.create && $listing->poster == $user->id)}
-						{icon controller=$controller action=edit record=$listing}
+					{if $permissions.edit || ($permissions.create && $item->poster == $user->id)}
+						{icon controller=$controller action=edit record=$item}
 					{/if}
-					{if $permissions.delete || ($permissions.create && $listing->poster == $user->id)}
-						{icon controller=$controller action=delete record=$listing}
+					{if $permissions.delete || ($permissions.create && $item->poster == $user->id)}
+						{icon controller=$controller action=delete record=$item}
 					{/if}
 				</div>
 			{/permissions}
 			{clear}
 		</li>
         {/foreach}
+		{pagelinks paginate=$page bottom=1}
 	</ul>
 </div>