Allow enable/disable on create. Enabled=>Status header
Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>
diff --git a/skyquake/framework/widgets/form_controls/input.jsx b/skyquake/framework/widgets/form_controls/input.jsx
index d605614..9b5e685 100644
--- a/skyquake/framework/widgets/form_controls/input.jsx
+++ b/skyquake/framework/widgets/form_controls/input.jsx
@@ -74,6 +74,11 @@
if( props.readonly && props.type == "checkbox" && props.checked ) {
displayedValue = <img src={CircleSVG} />
}
+
+ if( props.readonly && props.type == "radiogroup" && props.readonlydisplay ) {
+ displayedValue = props.readonlydisplay
+ }
+
let html = (
<label className={className} style={props.style}>
<span> { label } {isRequired}</span>
diff --git a/skyquake/plugins/user_management/src/dashboard/dashboard.jsx b/skyquake/plugins/user_management/src/dashboard/dashboard.jsx
index 0377a54..30ee04d 100644
--- a/skyquake/plugins/user_management/src/dashboard/dashboard.jsx
+++ b/skyquake/plugins/user_management/src/dashboard/dashboard.jsx
@@ -114,12 +114,12 @@
disabled: [null]
}
}
- this.Store.createUser({
- 'user-name': this.state['user-name'],
- 'user-domain': this.state['user-domain'],
- 'password': this.state['new-password']
- // 'confirm-password': this.state['confirm-password']
- });
+ this.Store.createUser(_.merge({
+ 'user-name': this.state['user-name'],
+ 'user-domain': this.state['user-domain'],
+ 'password': this.state['new-password']
+ // 'confirm-password': this.state['confirm-password']
+ }, isDisabled));
}
}
updateUser = (e) => {
@@ -298,10 +298,12 @@
<Input
type="radiogroup"
onChange={this.disableChange}
- label="Disabled"
+ label="STATUS"
value={this.state.disabled}
- options={["TRUE","FALSE"]}
- readonly={state.isReadOnly} />
+ options={[{label: "DISABLED", value: "TRUE"},{label: "ENABLED", value: "FALSE"}]}
+ readonly={state.isReadOnly}
+ readonlydisplay={this.state.disabled == "TRUE" ? "DISABLED" : "ENABLED"}
+ />
</FormSection>
<FormSection title="PLATFORM ROLES" style={{display:'none'}}>
<Input label="Super Admin" onChange={this.platformChange.bind(null, 'super_admin')} checked={state.platformRoles.super_admin} type="checkbox" />
diff --git a/skyquake/plugins/user_management/src/dashboard/userMgmt.scss b/skyquake/plugins/user_management/src/dashboard/userMgmt.scss
index a332c55..f503b05 100644
--- a/skyquake/plugins/user_management/src/dashboard/userMgmt.scss
+++ b/skyquake/plugins/user_management/src/dashboard/userMgmt.scss
@@ -142,7 +142,7 @@
color:white;
}
.activeUser, &-active{
- background: #00acee;
+ background: #00acee !important;
}
}
diff --git a/skyquake/plugins/user_management/src/dashboard/userMgmtStore.js b/skyquake/plugins/user_management/src/dashboard/userMgmtStore.js
index ada7067..9654b4a 100644
--- a/skyquake/plugins/user_management/src/dashboard/userMgmtStore.js
+++ b/skyquake/plugins/user_management/src/dashboard/userMgmtStore.js
@@ -122,7 +122,7 @@
resetUser() {
let username = '';
let domain = 'system';
- let disabled = false;
+ let disabled = "FALSE";
let platformRoles = {
super_admin: false,
platform_admin: false,