[ACL] [com_fields fields view] Correct when display batch button (#12826

) * Update view.html.php * Update default.php
joomla · Nov 15, 2016 · 4c8344d · 4c8344d
1 parent 8bc8984
commit 4c8344d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/administrator/components/com_fields/views/fields/tmpl/default.php b/administrator/components/com_fields/views/fields/tmpl/default.php
@@ -196,9 +196,9 @@
 				</tbody>
 			</table>
 			<?php //Load the batch processing form. ?>
-			<?php if ($user->authorise('core.create', $context)
-				&& $user->authorise('core.edit', $context)
-				&& $user->authorise('core.edit.state', $context)) : ?>
+			<?php if ($user->authorise('core.create', $this->component)
+				&& $user->authorise('core.edit', $this->component)
+				&& $user->authorise('core.edit.state', $this->component)) : ?>
 				<?php echo JHtml::_(
 						'bootstrap.renderModal',
 						'collapseModal',

diff --git a/administrator/components/com_fields/views/fields/view.html.php b/administrator/components/com_fields/views/fields/view.html.php
@@ -152,8 +152,7 @@ protected function addToolbar()
 		}
 
 		// Add a batch button
-		if ($user->authorise('core.create', $this->context) && $user->authorise('core.edit', $this->context)
-			&& $user->authorise('core.edit.state', $this->context))
+		if ($canDo->get('core.create') && $canDo->get('core.edit') && $canDo->get('core.edit.state'))
 		{
 			$title = JText::_('JTOOLBAR_BATCH');