From 5cb08db73742e94b61377efea5f61612a496dd6c Mon Sep 17 00:00:00 2001 From: fipwmaqzufheoxq92ebc <29818044+fipwmaqzufheoxq92ebc@users.noreply.github.com> Date: Fri, 28 Aug 2020 15:44:49 +0200 Subject: [PATCH] Disable buttons the user isn't allowed to use. --- controllers/BaseController.php | 3 +++ public/css/grocy.css | 4 ++++ public/js/grocy.js | 8 ++++++++ views/batteries.blade.php | 6 +++--- views/batteriesjournal.blade.php | 2 +- views/batteriesoverview.blade.php | 4 ++-- views/choresjournal.blade.php | 2 +- views/choresoverview.blade.php | 4 ++-- views/layout/default.blade.php | 16 +++++++++------- views/stockoverview.blade.php | 18 +++++++++--------- 10 files changed, 42 insertions(+), 25 deletions(-) diff --git a/controllers/BaseController.php b/controllers/BaseController.php index 0de7c51f..d4a6d4f3 100644 --- a/controllers/BaseController.php +++ b/controllers/BaseController.php @@ -2,6 +2,7 @@ namespace Grocy\Controllers; +use Grocy\Controllers\Users\User; use \Grocy\Services\DatabaseService; use \Grocy\Services\ApplicationService; use \Grocy\Services\LocalizationService; @@ -66,6 +67,8 @@ class BaseController } $this->View->set('featureFlags', $constants); + $this->View->set('permissions', User::PermissionList()); + return $this->View->render($response, $page, $data); } diff --git a/public/css/grocy.css b/public/css/grocy.css index 295aea0b..e259138f 100644 --- a/public/css/grocy.css +++ b/public/css/grocy.css @@ -581,3 +581,7 @@ canvas.drawingBuffer { } } +.not-allowed { + pointer-events: none; + opacity: 0.5; +} \ No newline at end of file diff --git a/public/js/grocy.js b/public/js/grocy.js index 275cd6fe..ed73d677 100644 --- a/public/js/grocy.js +++ b/public/js/grocy.js @@ -662,3 +662,11 @@ $.extend(true, $.fn.dataTable.defaults, { }); } }); + +$(Grocy.Permissions).each(function (index, item) +{ + if(item.has_permission == 0) + { + $('.permission-'+item.permission_name).addClass('disabled').addClass('not-allowed'); + } +}); diff --git a/views/batteries.blade.php b/views/batteries.blade.php index 9926c37d..8d2a1239 100644 --- a/views/batteries.blade.php +++ b/views/batteries.blade.php @@ -20,7 +20,7 @@
- + {{ $__t('Add') }}
@@ -57,10 +57,10 @@ @foreach($batteries as $battery) - + - + diff --git a/views/batteriesjournal.blade.php b/views/batteriesjournal.blade.php index a4d3e479..bce9d714 100644 --- a/views/batteriesjournal.blade.php +++ b/views/batteriesjournal.blade.php @@ -50,7 +50,7 @@ @foreach($chargeCycles as $chargeCycleEntry) - + diff --git a/views/batteriesoverview.blade.php b/views/batteriesoverview.blade.php index 5da87a25..91aa97d2 100644 --- a/views/batteriesoverview.blade.php +++ b/views/batteriesoverview.blade.php @@ -69,7 +69,7 @@ @foreach($current as $currentBatteryEntry) - @@ -85,7 +85,7 @@ {{ $__t('Journal for this battery') }} - + {{ $__t('Edit battery') }}
diff --git a/views/choresjournal.blade.php b/views/choresjournal.blade.php index 70243079..8c10f939 100644 --- a/views/choresjournal.blade.php +++ b/views/choresjournal.blade.php @@ -53,7 +53,7 @@ @foreach($choresLog as $choreLogEntry) - + diff --git a/views/choresoverview.blade.php b/views/choresoverview.blade.php index d83a80c9..77e7ba1b 100644 --- a/views/choresoverview.blade.php +++ b/views/choresoverview.blade.php @@ -95,7 +95,7 @@ @foreach($currentChores as $curentChoreEntry) - @@ -111,7 +111,7 @@ {{ $__t('Journal for this chore') }} - + {{ $__t('Edit chore') }} diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php index 3872148f..87ae27a9 100644 --- a/views/layout/default.blade.php +++ b/views/layout/default.blade.php @@ -59,6 +59,8 @@ Grocy.GettextPo = {!! $GettextPo !!}; Grocy.FeatureFlags = {!! json_encode($featureFlags) !!}; + Grocy.Permissions = {!! json_encode($permissions) !!}; + @if (GROCY_AUTHENTICATED) Grocy.UserSettings = {!! json_encode($userSettings) !!}; Grocy.UserId = {{ GROCY_USER_ID }}; @@ -163,27 +165,27 @@ @if(GROCY_FEATURE_FLAG_STOCK)
-
  • +
  • {{ $__t('Purchase') }}
    • -
  • +
  • {{ $__t('Consume') }}
    • @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) -
  • +
  • {{ $__t('Transfer') }}
    • @endif -
  • +
  • {{ $__t('Inventory') }} @@ -191,7 +193,7 @@
    • @endif @if(GROCY_FEATURE_FLAG_CHORES) -
  • +
  • {{ $__t('Chore tracking') }} @@ -199,7 +201,7 @@
    • @endif @if(GROCY_FEATURE_FLAG_BATTERIES) -
  • +
  • {{ $__t('Battery tracking') }} @@ -417,7 +419,7 @@ @endif
    @if(GROCY_SHOW_AUTH_VIEWS) -      {{ $__t('Manage users') }} +  {{ $__t('Manage users') }}
     {{ $__t('Manage API keys') }} @endif diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php index e892ed6e..adf7bb17 100644 --- a/views/stockoverview.blade.php +++ b/views/stockoverview.blade.php @@ -121,14 +121,14 @@ @foreach($currentStock as $currentStockEntry) amount > 0) table-warning @elseif ($currentStockEntry->product_missing) table-info @endif"> - 1 - {{ $__t('Consume all %s which are currently in stock', $currentStockEntry->product_name) }} - + {{ $__t('Add to shopping list') }}
    - + {{ $__t('Purchase') }} - + {{ $__t('Consume') }} @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) - + {{ $__t('Transfer') }} @endif - + {{ $__t('Inventory') }}
    @@ -185,11 +185,11 @@ {{ $__t('Stock journal for this product') }} - + {{ $__t('Edit product') }}
    -