Made the filter order consistent with the list

joomla · Apr 30, 2016 · a281954 · a281954
1 parent 060fd4e
commit a281954
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/administrator/components/com_users/models/forms/filter_users.xml b/administrator/components/com_users/models/forms/filter_users.xml
@@ -35,6 +35,15 @@
 			>
 			<option value="">COM_USERS_FILTER_USERGROUP</option>
 		</field>
+		<field
+				name="lastvisitrange"
+				type="lastvisitdaterange"
+				label="COM_USERS_OPTION_FILTER_LAST_VISIT_DATE"
+				description="COM_USERS_OPTION_FILTER_LAST_VISIT_DATE"
+				onchange="this.form.submit();"
+		>
+			<option value="">COM_USERS_OPTION_FILTER_LAST_VISIT_DATE</option>
+		</field>
 		<field
 			name="range"
 			type="registrationdaterange"
@@ -44,15 +53,6 @@
 			>
 			<option value="">COM_USERS_OPTION_FILTER_DATE</option>
 		</field>
-		<field
-			name="lastvisitrange"
-			type="lastvisitdaterange"
-			label="COM_USERS_OPTION_FILTER_LAST_VISIT_DATE"
-			description="COM_USERS_OPTION_FILTER_LAST_VISIT_DATE"
-			onchange="this.form.submit();"
-			>
-			<option value="">COM_USERS_OPTION_FILTER_LAST_VISIT_DATE</option>
-		</field>
 	</fields>
 	<fields name="list">
 		<field

diff --git a/administrator/components/com_users/models/users.php b/administrator/components/com_users/models/users.php
@@ -79,7 +79,9 @@ protected function populateState($ordering = 'a.name', $direction = 'asc')
 		$this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'cmd'));
 		$this->setState('filter.group_id', $this->getUserStateFromRequest($this->context . '.filter.group_id', 'filter_group_id', null, 'int'));
 		$this->setState('filter.range', $this->getUserStateFromRequest($this->context . '.filter.range', 'filter_range', '', 'cmd'));
-		$this->setState('filter.lastvisitrange', $this->getUserStateFromRequest($this->context . '.filter.lastvisitrange', 'filter_lastvisitrange', '', 'cmd'));
+		$this->setState(
+			'filter.lastvisitrange', $this->getUserStateFromRequest($this->context . '.filter.lastvisitrange', 'filter_lastvisitrange', '', 'cmd')
+		);
 
 		$groups = json_decode(base64_decode($app->input->get('groups', '', 'BASE64')));