From 68437f8671b74a7759a2cfd71b9bbc16d5158b34 Mon Sep 17 00:00:00 2001 From: Zarlex Date: Wed, 3 Jun 2020 11:07:51 +0200 Subject: [PATCH] Fix: Use mwModelAttr if provided to set selected item of selectbox --- CHANGELOG.md | 4 ++++ package.json | 2 +- src/mw-inputs/directives/mw_select_box.js | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc5a1162..d1877376 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v1.24.4 +## Bug Fixes +- `mwSelectBox`: Use mwModelAttr if provided to set selected item of selectbox + # v1.24.3 ## Bug Fixes - Remove angular sanitize from file include in mwUI.Relution to provide angular 1.5 support diff --git a/package.json b/package.json index 7ef95cc1..9c7c2add 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "mw-uikit", "description": "A toolbox to build portals with AngularJS 1.5.x that have a lot of forms and list views for example admin portals to manage data.", "author": "Alexander Zarges (http://relution.io)", - "version": "1.24.3", + "version": "1.24.4", "license": "Apache-2.0", "dependencies": { "showdown": "1.2.3", diff --git a/src/mw-inputs/directives/mw_select_box.js b/src/mw-inputs/directives/mw_select_box.js index e11668c2..ee324b98 100644 --- a/src/mw-inputs/directives/mw_select_box.js +++ b/src/mw-inputs/directives/mw_select_box.js @@ -36,8 +36,9 @@ angular.module('mwUI.Inputs') }; var setSelectedVal = function () { - - if (scope.mwModel.id) { + if(scope.mwModelAttr){ + scope.viewModel.selected = scope.mwModel.get(scope.mwModelAttr); + } else if (scope.mwModel.id) { scope.viewModel.selected = scope.mwModel.id.toString(); } };