mirror of
https://github.com/ClusterCockpit/cc-backend
synced 2024-12-26 05:19:05 +01:00
Remove role label array from frontend
- made centralized role array uncentralized again
This commit is contained in:
parent
7fb94c33cf
commit
a2ebebd7f6
@ -143,7 +143,7 @@ func IsValidRole(role string) bool {
|
|||||||
func GetValidRoles(user *User) ([5]string, error) {
|
func GetValidRoles(user *User) ([5]string, error) {
|
||||||
var vals [5]string
|
var vals [5]string
|
||||||
if (!user.HasRole(RoleAdmin)) {
|
if (!user.HasRole(RoleAdmin)) {
|
||||||
return vals, fmt.Errorf("%#v: only admins are allowed to fetch a list of roles", user.Username)
|
return vals, fmt.Errorf("%s: only admins are allowed to fetch a list of roles", user.Username)
|
||||||
} else {
|
} else {
|
||||||
return validRoles, nil
|
return validRoles, nil
|
||||||
}
|
}
|
||||||
|
@ -7,13 +7,6 @@
|
|||||||
|
|
||||||
let message = {msg: '', color: '#d63384'}
|
let message = {msg: '', color: '#d63384'}
|
||||||
let displayMessage = false
|
let displayMessage = false
|
||||||
let roleLabel = {
|
|
||||||
api: 'API',
|
|
||||||
user: 'User (regular user, same as if created via LDAP sync.)',
|
|
||||||
manager: 'Manager',
|
|
||||||
support: 'Support',
|
|
||||||
admin: 'Admin'
|
|
||||||
}
|
|
||||||
|
|
||||||
export let roles = []
|
export let roles = []
|
||||||
|
|
||||||
@ -86,12 +79,12 @@
|
|||||||
{#if i == 0}
|
{#if i == 0}
|
||||||
<div>
|
<div>
|
||||||
<input type="radio" id={role} name="role" value={role} checked/>
|
<input type="radio" id={role} name="role" value={role} checked/>
|
||||||
<label for={role}>{roleLabel[role]}</label>
|
<label for={role}>{role.charAt(0).toUpperCase() + role.slice(1)} (regular user, same as if created via LDAP sync.)</label>
|
||||||
</div>
|
</div>
|
||||||
{:else}
|
{:else}
|
||||||
<div>
|
<div>
|
||||||
<input type="radio" id={role} name="role" value={role}/>
|
<input type="radio" id={role} name="role" value={role}/>
|
||||||
<label for={role}>{roleLabel[role]}</label>
|
<label for={role}>{role.charAt(0).toUpperCase() + role.slice(1)}</label>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
{/each}
|
{/each}
|
||||||
|
@ -9,13 +9,6 @@
|
|||||||
let displayMessage = false
|
let displayMessage = false
|
||||||
|
|
||||||
export let roles = []
|
export let roles = []
|
||||||
let roleLabel = {
|
|
||||||
api: 'API',
|
|
||||||
user: 'User',
|
|
||||||
manager: 'Manager',
|
|
||||||
support: 'Support',
|
|
||||||
admin: 'Admin'
|
|
||||||
}
|
|
||||||
|
|
||||||
async function handleAddRole() {
|
async function handleAddRole() {
|
||||||
const username = document.querySelector('#role-username').value
|
const username = document.querySelector('#role-username').value
|
||||||
@ -96,7 +89,7 @@
|
|||||||
<select class="form-select" id="role-select">
|
<select class="form-select" id="role-select">
|
||||||
<option selected value="">Role...</option>
|
<option selected value="">Role...</option>
|
||||||
{#each roles as role}
|
{#each roles as role}
|
||||||
<option value={role}>{roleLabel[role]}</option>
|
<option value={role}>{role.charAt(0).toUpperCase() + role.slice(1)}</option>
|
||||||
{/each}
|
{/each}
|
||||||
</select>
|
</select>
|
||||||
<!-- PreventDefault on Sveltestrap-Button more complex to achieve than just use good ol' html button -->
|
<!-- PreventDefault on Sveltestrap-Button more complex to achieve than just use good ol' html button -->
|
||||||
|
Loading…
Reference in New Issue
Block a user