Merge pull request #9232 from andrepereiradasilva/com_modules-searcht…

…ools [com_modules] modules view (modal) - Implement searchtools
joomla · Apr 14, 2016 · 4cdf71a · 4cdf71a
2 parents cc44ae1 + 607851b
commit 4cdf71a
Show file tree

Hide file tree

Showing 8 changed files with 361 additions and 359 deletions.
diff --git a/administrator/components/com_modules/layouts/joomla/searchtools/default.php b/administrator/components/com_modules/layouts/joomla/searchtools/default.php
@@ -14,27 +14,28 @@
 // Receive overridable options
 $data['options'] = !empty($data['options']) ? $data['options'] : array();
 
-$doc = JFactory::getDocument();
+if ($data['view'] instanceof ModulesViewModules && JFactory::getApplication()->input->get('layout', '', 'cmd') !== 'modal')
+{
+	JFactory::getDocument()->addStyleDeclaration("
+		/* Fixed filter field in search bar */
+		.js-stools .js-stools-client_id {
+			float: left;
+			margin-right: 10px;
+			min-width: 220px;
+		}
+		html[dir=rtl] .js-stools .js-stools-client_id {
+			float: right;
+			margin-left: 10px
+			margin-right: 0;
+		}
+		.js-stools .js-stools-container-bar .js-stools-field-filter .chzn-container {
+			padding: 3px 0;
+		}
+	");
 
-$doc->addStyleDeclaration("
-	/* Fixed filter field in search bar */
-	.js-stools .js-stools-client_id {
-		float: left;
-		margin-right: 10px;
-		min-width: 220px;
-	}
-	html[dir=rtl] .js-stools .js-stools-client_id {
-		float: right;
-		margin-left: 10px
-		margin-right: 0;
-	}
-	.js-stools .js-stools-container-bar .js-stools-field-filter .chzn-container {
-		padding: 3px 0;
-	}
-");
+	// Client selector doesn't have to activate the filter bar.
+	unset($data['view']->activeFilters['client_id']);
+}
 
-// Menutype filter doesn't have to activate the filter bar
-unset($data['view']->activeFilters['client_id']);
-
-// Display the main joomla layout
+// Display the main joomla layout.
 echo JLayoutHelper::render('joomla.searchtools.default', $data, null, array('component' => 'none'));
diff --git a/administrator/components/com_modules/layouts/joomla/searchtools/default/bar.php b/administrator/components/com_modules/layouts/joomla/searchtools/default/bar.php
@@ -11,9 +11,9 @@
 
 $data = $displayData;
 
-if ($data['view'] instanceof ModulesViewModules)
+if ($data['view'] instanceof ModulesViewModules && JFactory::getApplication()->input->get('layout', '', 'cmd') !== 'modal')
 {
-	// We will get the client filter & remove it from the form filters
+	// Add the client selector before the form filters.
 	$clientIdField = $data['view']->filterForm->getField('client_id');
 ?>
 	<div class="js-stools-field-filter js-stools-client_id">
@@ -22,5 +22,5 @@
 <?php
 }
 
-// Display the main joomla layout
+// Display the main joomla layout.
 echo JLayoutHelper::render('joomla.searchtools.default.bar', $data, null, array('component' => 'none'));
diff --git a/administrator/components/com_modules/models/forms/filter_modules.xml b/administrator/components/com_modules/models/forms/filter_modules.xml
@@ -72,25 +72,25 @@
 			description="JGLOBAL_SORT_BY"
 			statuses="*,0,1,-2"
 			onchange="this.form.submit();"
-			default="position ASC"
+			default="a.position ASC"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
-			<option value="ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
-			<option value="ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
 			<option value="a.published ASC">JSTATUS_ASC</option>
 			<option value="a.published DESC">JSTATUS_DESC</option>
 			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
 			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
-			<option value="position ASC">COM_MODULES_HEADING_POSITION_ASC</option>
-			<option value="position DESC">COM_MODULES_HEADING_POSITION_DESC</option>
+			<option value="a.position ASC">COM_MODULES_HEADING_POSITION_ASC</option>
+			<option value="a.position DESC">COM_MODULES_HEADING_POSITION_DESC</option>
 			<option value="name ASC">COM_MODULES_HEADING_MODULE_ASC</option>
 			<option value="name DESC">COM_MODULES_HEADING_MODULE_DESC</option>
 			<option value="pages ASC">COM_MODULES_HEADING_PAGES_ASC</option>
 			<option value="pages DESC">COM_MODULES_HEADING_PAGES_DESC</option>
-			<option value="a.access ASC">JGRID_HEADING_ACCESS_ASC</option>
-			<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
-			<option value="language_title ASC">JGRID_HEADING_LANGUAGE_ASC</option>
-			<option value="language_title DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="ag.title ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="ag.title DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="l.title ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="l.title DESC">JGRID_HEADING_LANGUAGE_DESC</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>