hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-18 07:23:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix EditUser submit bug

Browse Source
This commit is contained in:
Nathan Barber
2021-04-07 12:37:36 -04:00
parent 7e132f22e6
commit 405d78a9d4
5 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jsx/src/components/AddUser/AddUser.pre.jsx
View File

@@ -36,14 +36,7 @@ const AddUser = (props) => {
type="checkbox"
value=""
id="admin-check"
onChange={(e) =>
// this.setState(
// Object.assign({}, this.state, {
// admin: e.target.checked,
// })
// )
setAdmin(e.target.checked)
}
onChange={(e) => setAdmin(e.target.checked)}
/>
<span> </span>
<label className="form-check-label">Admin</label>

4
jsx/src/components/EditUser/EditUser.js
View File

@@ -12,9 +12,7 @@ const withUserAPI = withProps((props) => ({
deleteUser: (username) => jhapiRequest("/users/" + username, "DELETE"),
failRegexEvent: () =>
alert(
"Removed " +
JSON.stringify(removed_users) +
" for either containing special characters or being too short."
"Cannot change username - either contains special characters or is too short."
),
refreshUserData: () =>
jhapiRequest("/users", "GET")

36
jsx/src/components/EditUser/EditUser.pre.jsx
View File

@@ -79,24 +79,34 @@ const EditUser = (props) => {
id="submit"
className="btn btn-primary"
onClick={() => {
if (updatedUsername == "" && admin == has_admin) return;
if (
updatedUsername.length > 2 &&
/[!@#$%^&*(),.?":{}|<>]/g.test(updatedUsername) == false
) {
editUser(
username,
updatedUsername != "" ? updatedUsername : username,
admin
)
if (updatedUsername == "" && admin == has_admin) {
return;
} else if (updatedUsername != "") {
if (
updatedUsername.length > 2 &&
/[!@#$%^&*(),.?":{}|<>]/g.test(updatedUsername) == false
) {
editUser(
username,
updatedUsername != "" ? updatedUsername : username,
admin
)
.then((data) => {
history.push("/");
refreshUserData();
})
.catch((err) => {});
} else {
setUpdatedUsername("");
failRegexEvent();
}
} else {
editUser(username, username, admin)
.then((data) => {
history.push("/");
refreshUserData();
})
.catch((err) => {});
} else {
setUpdatedUsername(null);
failRegexEvent();
}
}}
>