From: Laurence Maultsby <laurence.maultsby@riftio.com>
Date: Tue, 9 May 2017 14:23:33 +0000 (-0400)
Subject: Allow enable/disable on create. Enabled=>Status header
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=bc747990c2dc8bbdb262ad81da7b6741a4000677;p=osm%2FUI.git

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 d6056149e..9b5e685bb 100644
--- a/skyquake/framework/widgets/form_controls/input.jsx
+++ b/skyquake/framework/widgets/form_controls/input.jsx
@@ -74,6 +74,11 @@ export default class Input extends Component {
         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 0377a54b1..30ee04d0f 100644
--- a/skyquake/plugins/user_management/src/dashboard/dashboard.jsx
+++ b/skyquake/plugins/user_management/src/dashboard/dashboard.jsx
@@ -114,12 +114,12 @@ class UserManagementDashboard extends React.Component {
                     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 @@ class UserManagementDashboard extends React.Component {
                                 <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 a332c556a..f503b05af 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 ada70677e..9654b4a12 100644
--- a/skyquake/plugins/user_management/src/dashboard/userMgmtStore.js
+++ b/skyquake/plugins/user_management/src/dashboard/userMgmtStore.js
@@ -122,7 +122,7 @@ export default class UserManagementStore {
     resetUser() {
         let username = '';
         let domain = 'system';
-        let disabled = false;
+        let disabled = "FALSE";
         let platformRoles = {
             super_admin: false,
             platform_admin: false,