Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix member select field on booking form; fixes #1707 and #1709 #33

Merged
merged 3 commits into from
Sep 28, 2023
Merged

Fix member select field on booking form; fixes #1707 and #1709 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5553db3
Fix member select field on booking form
Sep 27, 2023
e35831c
Fix booking from the members list; fixes #1709
Sep 27, 2023
01acd8d
Add FUI apiSettings cache parameter to choose_adh
Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions lib/GaletteEvents/Controllers/Crud/BookingsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,15 @@ class BookingsController extends AbstractPluginController
/**
* Add page
*
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param Request $request PSR Request
* @param Response $response PSR Response
* @param integer|null $id_adh Member id
*
* @return Response
*/
public function add(Request $request, Response $response): Response
public function add(Request $request, Response $response, int $id_adh = null): Response
{
return $this->edit($request, $response, null, 'add');
return $this->edit($request, $response, null, 'add', $id_adh);
}

/**
Expand Down
9 changes: 6 additions & 3 deletions templates/default/booking.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
{% endif %}

{% if (login.isAdmin() or login.isStaff()) or login.isGroupManager() %}
<div class="field">
<div class="field required">
<label for="member">{{ _T("Member") }}</label>
<div id="member" class="jsonly search-dropdown ui input nochosen paginated">
<input id="member_input" type="text" name="member" value="{{ booking.getMemberId() }}" placeholder="{{ _T("Member") }}">
<input id="member_input" type="hidden" name="member" value="{{ booking.getMemberId() }}" placeholder="{{ _T("Member") }}">
<i class="jsonly displaynone dropdown icon"></i>
<span class="ui mini compact icon disabled button prev-results"><i class="jsonly displaynone chevron circle left icon disabled button tooltip" title="{{ _T("Load previous members...") }}"></i></span>
<span class="ui mini compact icon disabled button next-results"><i class="jsonly displaynone chevron circle right icon disabled button tooltip" title="{{ _T("Load following members...") }}"></i></span>
Expand Down Expand Up @@ -148,7 +148,10 @@

{% block javascripts %}
<script type="text/javascript">
{% include "elements/js/choose_adh.js.twig" with {"js_chosen_id": "#member"} %}
{% include "elements/js/choose_adh.js.twig" with {
"js_chosen_id": "#member",
"js_chosen_cache": false
} %}

$('#event').on('change', function() {
var _this = $(this);
Expand Down