diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.html b/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.html index 7b2ce74430f20fe7b8c36e2756322397bcfb8803..1fca1b63fe4b07ffd414db9cad081c21216f1b42 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.html +++ b/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.html @@ -21,7 +21,7 @@ <span ng-show="formField.defaultValue && formField.uiControl != 'checkbox' && formField.uiControl != 'radio'"> <br /> {{ 'General_Default'|translate }}: - <span>{{formField.defaultValue|limitTo:50}}</span> + <span>{{formField.defaultValuePretty|limitTo:50}}</span> </span> </div> </div> diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js b/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js index f3d9680819dab902359defc0b70725a225756c5e..821404e9e24431aa638b0be01768ea48e431ba79 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js +++ b/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js @@ -244,11 +244,34 @@ return field.availableValues; } + function formatPrettyDefaultValue(defaultValue, availableOptions) { + + if (!angular.isArray(availableOptions)) { + return defaultValue; + } + + var prettyValues = []; + + if (!angular.isArray(defaultValue)) { + defaultValue = [defaultValue]; + } + + angular.forEach(availableOptions, function (value, key) { + if (defaultValue.indexOf(value.key) !== -1) { + prettyValues.push(value.value); + } + }); + + return prettyValues.join(', '); + } + return function (scope, element, attrs) { var field = scope.piwikFormField; + var defaultValue = field.defaultValue; + if (angular.isArray(field.defaultValue)) { - field.defaultValue = field.defaultValue.join(','); + field.defaultValue = defaultValue.join(','); } if (field.type === 'boolean') { @@ -263,6 +286,8 @@ // availableValues and in the watch change availableValues could trigger lots of more watch events field.availableOptions = formatAvailableValues(field); + field.defaultValuePretty = formatPrettyDefaultValue(defaultValue, field.availableOptions); + field.showField = true; var inlineHelpNode; diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png index fa3726eebaf6a369f70feb7bbba5a14d8e1509b0..e71e879402f3a9488981de4a8012bd83b5eee5df 100644 Binary files a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png and b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png differ diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png index 83a4b8ac44414d6f0ae1bb7f9763dc3aa7cec6e9..c13ddb72b90a6fc73c82ceaa3719aa6b07cb3b5d 100644 Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png differ