Merge lp:~henrik-lochmann/goobi-presentation/bug-1049565 into lp:~slub.team/goobi-presentation/old-bzr-trunk

[Henrik Lochmann]

[Sebastian Meyer (sebastian-meyer)]

review: Approve

=== modified file 'dlf/plugins/listview/class.tx_dlf_listview.php'
--- dlf/plugins/listview/class.tx_dlf_listview.php	2012-08-22 19:22:29 +0000
+++ dlf/plugins/listview/class.tx_dlf_listview.php	2012-09-12 12:24:27 +0000
@@ -293,6 +293,17 @@
 
 		}
 
+		$sorting .= '</select>';
+		
+		// sort direction
+		$uniqId = uniqid($prefix.'-');
+		
+		$sorting .= '<label for="'.$uniqId.'">'.$this->pi_getLL('direction', '', TRUE).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[direction]" onchange="javascript:this.form.submit();">';
+
+		$sorting .= '<option value="asc" '.(($this->list->metadata['options']['order_direction'] === 'asc') ? ' selected="selected"' : '').'>'.$this->pi_getLL('direction.asc', '', TRUE).'</option>';
+		
+		$sorting .= '<option value="desc" '.(($this->list->metadata['options']['order_direction'] === 'desc') ? ' selected="selected"' : '').'>'.$this->pi_getLL('direction.desc', '', TRUE).'</option>';
+		
 		$sorting .= '</select></div></form>';
 
 		return $sorting;
@@ -457,15 +468,18 @@
 		$this->list = t3lib_div::makeInstance('tx_dlf_list');
 
 		// Sort the list if applicable.
-		if (!empty($this->piVars['order']) && $this->piVars['order'] != $this->list->metadata['options']['order']) {
+		if ((!empty($this->piVars['order']) && $this->piVars['order'] != $this->list->metadata['options']['order'])
+				|| (!empty($this->piVars['direction']) && $this->piVars['direction'] != $this->list->metadata['options']['order_direction'])) {
 
 			// Order list by given field.
-			$this->list->sort($this->piVars['order'], TRUE);
+			$this->list->sort($this->piVars['order'], $this->piVars['direction'] === 'asc' ? TRUE : FALSE);
 
 			// Update list's metadata.
 			$listMetadata = $this->list->metadata;
 
 			$listMetadata['options']['order'] = $this->piVars['order'];
+			
+			$listMetadata['options']['order_direction'] = $this->piVars['direction'];
 
 			$this->list->metadata = $listMetadata;
 

=== modified file 'dlf/plugins/listview/locallang.xml'
--- dlf/plugins/listview/locallang.xml	2012-08-14 15:39:30 +0000
+++ dlf/plugins/listview/locallang.xml	2012-09-12 12:24:27 +0000
@@ -20,6 +20,9 @@
 			<label index="skip">...</label>
 			<label index="orderBy">Order by: </label>
 			<label index="relevance">relevance</label>
+			<label index="direction">Direction:</label>
+			<label index="direction.asc">ascending</label>
+			<label index="direction.desc">descending</label>
 			<label index="noTitle">[no title]</label>
 		</languageKey>
 		<languageKey index="de" type="array">
@@ -37,6 +40,9 @@
 			<label index="skip">...</label>
 			<label index="orderBy">Sortieren nach: </label>
 			<label index="relevance">Relevanz</label>
+			<label index="direction">Richtung:</label>
+			<label index="direction.asc">aufsteigend</label>
+			<label index="direction.desc">absteigend</label>
 			<label index="noTitle">[kein Titel]</label>
 		</languageKey>
 	</data>