Merge pull request #341 from ovh-ux/master

AxelPeter · web-flow · commit c7f15e510440 · 2019-01-08T10:16:51.000+01:00
Sync master to develop
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="2.23.1"></a>
+## [2.23.1](https://github.com/ovh-ux/ovh-ui-angular/compare/v2.23.0...v2.23.1) (2019-01-08)
+
+
+### Bug Fixes
+
+* **oui-select:** add nested property support for match attribute ([#338](https://github.com/ovh-ux/ovh-ui-angular/issues/338)) ([6c87d73](https://github.com/ovh-ux/ovh-ui-angular/commit/6c87d73)), closes [#MANAGER-2056](https://github.com/ovh-ux/ovh-ui-angular/issues/MANAGER-2056)
+
+
+
 <a name="2.23.0"></a>
 # [2.23.0](https://github.com/ovh-ux/ovh-ui-angular/compare/v2.22.2...v2.23.0) (2018-12-11)
 
diff --git a/dist/oui-angular.min.js b/dist/oui-angular.min.js
diff --git a/dist/oui-angular.min.js.map b/dist/oui-angular.min.js.map
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "description": "A set of maintainable components for the OVH ecosystem (Angular).",
   "license": "BSD-3-Clause",
   "author": "OVH SAS",
-  "version": "2.23.0",
+  "version": "2.23.1",
   "keywords": [
     "angular"
   ],
diff --git a/packages/oui-select/src/select.controller.js b/packages/oui-select/src/select.controller.js
@@ -1,4 +1,5 @@
 import { addBooleanParameter } from "@ovh-ui/common/component-utils";
+import get from "lodash/get";
 
 export default class {
     constructor ($attrs, $compile, $element, $scope, $timeout) {
@@ -118,4 +119,8 @@ export default class {
             }
         });
     }
+
+    getPropertyValue (item) {
+        return get(item, this.match, null);
+    }
 }
diff --git a/packages/oui-select/src/templates/match.html b/packages/oui-select/src/templates/match.html
@@ -16,7 +16,7 @@
         </span>
         <span class="ui-select-match-text"
             ng-hide="$select.isEmpty()"
-            ng-bind-html="$select.selected[$ctrl.match] || $select.selected">
+            ng-bind-html="$ctrl.getPropertyValue($select.selected) || $select.selected">
         </span>
         <span class="oui-icon oui-icon-chevron-down"></span>
     </span>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { addBooleanParameter } from "@ovh-ui/common/component-utils";`
	`2`	`+import get from "lodash/get";`
`2`	`3`
`3`	`4`	`export default class {`
`4`	`5`	`constructor ($attrs, $compile, $element, $scope, $timeout) {`
`@@ -118,4 +119,8 @@ export default class {`
`118`	`119`	`}`
`119`	`120`	`});`
`120`	`121`	`}`
	`122`	`+`
	`123`	`+ getPropertyValue (item) {`
	`124`	`+ return get(item, this.match, null);`
	`125`	`+ }`
`121`	`126`	`}`