AVSDev/sprinkle-organisations
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Fixed button states

Browse Source
This commit is contained in:
Craig Williams
2022-02-15 16:58:39 +00:00
parent 3735e1e9ce
commit 77da13e0a0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Controller/OrganisationController.php
View File

@@ -625,10 +625,12 @@ class OrganisationController extends SimpleController
$params['ci'] = $this->ci; $params['ci'] = $this->ci;
$sprunje = $classMapper->createInstance('organisation_sprunje', $classMapper, $params); $sprunje = $classMapper->createInstance('organisation_sprunje', $classMapper, $params);
if (!$currentUser->isMaster() && $currentUser->roles()->where('slug', 'organisations-admin')->count() == 0) {
$sprunje->extendQuery(function ($query) use ($currentUser) { $sprunje->extendQuery(function ($query) use ($currentUser) {
return $query->withUser($currentUser->id);
});
if (!$currentUser->isMaster() && $currentUser->roles()->where('slug', 'organisations-admin')->count() == 0) {
$sprunje->extendQuery(function ($query) {
return $query->where('flag_approved', true) return $query->where('flag_approved', true)
->withUser($currentUser->id)
->orWhereNotNull('is_member'); ->orWhereNotNull('is_member');
}); });
} }

2
templates/tables/organisations.html.twig
View File

@@ -92,7 +92,7 @@
<script id="organisation-table-column-join" type="text/x-handlebars-template"> <script id="organisation-table-column-join" type="text/x-handlebars-template">
<td> <td>
<div class="btn-group"> <div class="btn-group">
{{#ifx row.is_pending '==' 0 }} {{#ifx row.is_pending '==' 1 }}
<button type="button" data-slug="{{row.slug}}" class="btn btn-danger js-organisation-cancelJoin" style="min-width: 70px"> <button type="button" data-slug="{{row.slug}}" class="btn btn-danger js-organisation-cancelJoin" style="min-width: 70px">
{% endverbatim %}{{translate("CANCEL")}}{% verbatim %} {% endverbatim %}{{translate("CANCEL")}}{% verbatim %}
</button> </button>