Browse Source

fix order alias prefixing

euromark 12 years ago
parent
commit
cbef0d1db8
3 changed files with 14 additions and 5 deletions
  1. 11 2
      Model/MyModel.php
  2. 1 1
      View/Elements/pagination.ctp
  3. 2 2
      View/Qlogin/admin_index.ctp

+ 11 - 2
Model/MyModel.php

@@ -65,7 +65,11 @@ class MyModel extends Model {
 				if (is_numeric($key)) {
 					$this->order[$key] = $this->prefixAlias($value);
 				} else {
-					$this->order[$this->prefixAlias($key)] = $value;
+					$newKey = $this->prefixAlias($key);
+					$this->order[$newKey] = $value;
+					if ($newKey !== $key) {
+						unset($this->order[$key]);
+					}
 				}
 			}
 		}
@@ -1053,7 +1057,9 @@ class MyModel extends Model {
 	 */
 	public function validateUrl($data, $options = array()) {
 		if (is_array($data)) {
-			$url = array_shift($data);
+			foreach ($data as $key => $url) {
+				break;
+			}
 		} else {
 			$url = $data;
 		}
@@ -1066,6 +1072,9 @@ class MyModel extends Model {
 		}
 		if (!isset($options['autoComplete']) || $options['autoComplete'] !== false) {
 			$url = $this->_autoCompleteUrl($url);
+			if (isset($key)) {
+				$this->data[$this->alias][$key] = $url;
+			}
 		}
 
 		if (!isset($options['strict']) || $options['strict'] !== false) {

+ 1 - 1
View/Elements/pagination.ctp

@@ -30,7 +30,7 @@ if (!empty($reverse)) {
 	$next = $tmp;
 }
 if (!empty($addArrows)) {
-	$prev = '« '.$prev;
+	$prev = '« ' . $prev;
 	$next .= ' »';
 }
 

+ 2 - 2
View/Qlogin/admin_index.ctp

@@ -13,8 +13,8 @@
 	<fieldset>
 		<legend><?php echo __('Add %s', __('Qlogin')); ?></legend>
 	<?php
-		echo $this->Form->input('url', array('placeholder'=>'/controller/action/...'));
-		echo $this->Form->input('user_id', array('empty'=>'---'));
+		echo $this->Form->input('url', array('placeholder' => '/controller/action/...'));
+		echo $this->Form->input('user_id', array('empty' => '---'));
 	?>
 	</fieldset>
 <?php echo $this->Form->end(__('Submit'));?>