Browse Source

UI-3135: Remove `service` property when not service plan is selected (#77)

* Only set user service plan with valid IDs on creation

* Remove `services` from document when no plan is selected
4.3
Joris Tirado 7 years ago
committed by GitHub
parent
commit
4a0f3b8873
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
  1. +3
    -1
      submodules/users/users.js
  2. +3
    -1
      submodules/users/views/creation.html

+ 3
- 1
submodules/users/users.js View File

@ -3067,6 +3067,8 @@ define(function(require) {
account_id: monster.config.resellerId,
overrides: {}
};
} else {
delete userData.service;
}
}
@ -3571,7 +3573,7 @@ define(function(require) {
};
if (formattedData.user.extra) {
if (formattedData.user.extra.hasOwnProperty('licensedRole')) {
if (formattedData.user.extra.hasOwnProperty('licensedRole') && formattedData.user.extra.licensedRole !== 'none') {
formattedData.user.service = formattedData.user.service || {};
formattedData.user.service.plans = {};
formattedData.user.service.plans[formattedData.user.extra.licensedRole] = {


+ 3
- 1
submodules/users/views/creation.html View File

@ -30,7 +30,9 @@
<label for="licensed_role" class="control-label"><i class="fa fa-user"></i></label>
<div class="controls">
<select id="licensed_role" name="user.extra.licensedRole" data-placeholder="{{ i18n.users.licensedUserRoles.selectPlaceholder }}">
<option value></option>
<option value="none">
{{ i18n.users.licensedUserRoles.licensedUserRoles.none }}
</option>
{{#each licensedUserRoles}}
<option value="{{id}}">{{name}}</option>
{{/each}}


Loading…
Cancel
Save