Merge branch 'release/0.12.1'

all-ride · May 20, 2016 · 88d39ba · 88d39ba
2 parents 13c710f + 4c335f9
commit 88d39ba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "ride/web-orm",
     "description": "ORM application of the Ride framework",
     "license": "MIT",
-    "version": "0.12.0",
+    "version": "0.12.1",
     "authors": [
         {
             "name": "Joris Vandeweerd",

diff --git a/src/ride/web/orm/form/row/GeoLocationRow.php b/src/ride/web/orm/form/row/GeoLocationRow.php
@@ -93,40 +93,25 @@ protected function setGeoLocationOptions() {
         $expression = array();
 
         $type = $this->getOption(self::OPTION_TYPE);
-        if ($type) {
-            if (is_array($type)) {
-                $types = array();
-                foreach ($type as $t) {
-                    $types[$t] = '"' . $t . '"';
-                }
-
-                $expression[] = '{type} IN (' . implode(', ', $types) . ')';
-            } else {
-                $expression[] = '{type} = "' . $type . '"';
-            }
-        }
 
         $filter = $this->getOption(self::OPTION_FILTER);
-        if ($filter) {
-            if (is_string($filter)) {
-                $expression[] = '{path} LIKE "%~' . $filter . '~%"';
-            } elseif ($filter instanceof GeoLocationEntry) {
-                $expression[] = '{path} LIKE "' . $filter->getPath() . '~%"';
-            }
+        if ($filter && $filter instanceof GeoLocationEntry) {
+            $filter = $filter->getPath();
         }
 
-        $expression[] = '({name} LIKE "%%term%%" OR {code} LIKE "%%term%%")';
-
         $queryParameters = array(
             'list' => 1,
             'fields' => array(
-                'geo-locations' => 'name',
+                'geo-locations' => 'code,name',
             ),
             'filter' => array(
-                'expression' => implode(' AND ', $expression),
+                'term' => '%term%',
+                'type' => $type,
+                'path' => $filter,
             ),
         );
-        $url = $this->web->getUrl('api.orm.entry.index', array('type' => 'geo-locations'), $queryParameters);
+
+        $url = $this->web->getUrl('api.orm.geo.search', null, $queryParameters);
 
         $this->setOption(self::OPTION_AUTO_COMPLETE_URL, $url);
     }