Skip to content

Commit eb5f57c

Browse files
committed
Updates to allow empty group_id
1 parent 93f3dec commit eb5f57c

3 files changed

Lines changed: 17 additions & 7 deletions

File tree

app/sprinkles/admin/assets/userfrosting/js/widgets/users.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ function attachUserForm() {
1515
width: '100%'
1616
});
1717

18+
// Needed to allow select2 to render a 'empty' list item.
19+
form.find(".js-select2-group").select2({
20+
width: '100%',
21+
templateResult: item => item.text || '\u200B'
22+
});
23+
1824
// Set up the form for submission
1925
form.ufForm({
2026
validator: page.validators
@@ -113,7 +119,7 @@ function updateUser(userName, fieldName, fieldValue) {
113119
} else {
114120
$("#alerts-page").ufAlerts('clear');
115121
}
116-
122+
117123
$("#alerts-page").ufAlerts('fetch').ufAlerts('render');
118124
}
119125

app/sprinkles/admin/src/Controller/UserController.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,11 +1016,11 @@ public function pageInfo(Request $request, Response $response, $args)
10161016
}
10171017

10181018
return $this->ci->view->render($response, 'pages/user.html.twig', [
1019-
'user' => $user,
1020-
'locales' => $locales,
1021-
'fields' => $fields,
1022-
'tools' => $editButtons,
1023-
'widgets' => $widgets,
1019+
'user' => $user,
1020+
'locales' => $locales,
1021+
'fields' => $fields,
1022+
'tools' => $editButtons,
1023+
'widgets' => $widgets,
10241024
'delete_redirect' => $this->ci->router->pathFor('uri_users')
10251025
]);
10261026
}
@@ -1155,6 +1155,9 @@ public function updateInfo(Request $request, Response $response, $args)
11551155
return $response->withJson([], 400);
11561156
}
11571157

1158+
if ($data['group_id'] == 0) {
1159+
$data['group_id'] = null;
1160+
}
11581161
// Begin transaction - DB will be rolled back if an exception occurs
11591162
Capsule::transaction(function () use ($data, $user, $currentUser) {
11601163
// Update the user and generate success messages

app/sprinkles/admin/templates/forms/user.html.twig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
{% if 'group' in form.fields.disabled %}
2525
<input type="text" class="form-control" name="theme" value="{{user.group.name}}" disabled>
2626
{% else %}
27-
<select id="input-group" class="form-control js-select2" name="group_id">
27+
<select id="input-group" class="form-control js-select2-group" name="group_id">
28+
<option></option>
2829
{% for group in groups %}
2930
<option value="{{group.id}}" {% if (group.id == user.group_id) %}selected{% endif %}>{{group.name}}</option>
3031
{% endfor %}

0 commit comments

Comments
 (0)