Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

classes/controller/AdminController.php

@@ -1528,7 +1528,7 @@ class AdminControllerCore extends Controller
 			$this->errors[] = Tools::displayError('You do not have permission to view this.');
 			return;
 		}
-		
+
 		$this->getLanguages();
 		// toolbar (save, cancel, new, ..)
 		$this->initToolbar();
@@ -1547,6 +1547,10 @@ class AdminControllerCore extends Controller
 				$this->loadObject(true);
 			$this->content .= $this->renderView();
 		}
+		elseif ($this->display == 'details')
+		{
+			$this->content .= $this->renderDetails();
+		}
 		elseif (!$this->ajax)
 		{
 			$this->content .= $this->renderModulesList();
@@ -1722,6 +1726,14 @@ class AdminControllerCore extends Controller
 		return $view;
 	}
 
+	/**
+	 * Override to render the view page
+	 */
+	public function renderDetails()
+	{
+		return $this->renderList();
+	}
+
 	/**
 	 * Function used to render the form for this controller
 	 */
@@ -2147,6 +2159,16 @@ class AdminControllerCore extends Controller
 			else
 				$this->errors[] = Tools::displayError('You do not have permission to view this.');
 		}
+		elseif (isset($_GET['details'.$this->table]))
+		{
+			if ($this->tabAccess['view'] === '1')
+			{
+				$this->display = 'details';
+				$this->action = 'details';
+			}
+			else
+				$this->errors[] = Tools::displayError('You do not have permission to view this.');
+		}
 		elseif (isset($_GET['export'.$this->table]))
 		{
 			if ($this->tabAccess['view'] === '1')