mirror of
https://github.com/grocy/grocy.git
synced 2025-10-12 16:44:55 +00:00
Squashed commit
Fixed some localization strings Reviewed/optimized product deletion handling Add option to hide products from the stock overview page (closes #906) Prefill default_due_days also on the inventory page (closes #591) Added DataTables accent chinese-string plugin (closes #872) Show costs and calories per recipe ingredient (closes #1072) Fixed user permission saving (fixes #1099) User permissions should not have an effect for demo mode (closes #972) Handle QU conversion when consuming a substituation (child) product (fixes #1118) Consume/open any child product when the parent product is not in stock (closes #899) Added a retry camera barcode scanning button to product picker workflow (closes #736)
This commit is contained in:
@@ -3,7 +3,8 @@
|
||||
name="{{ $perm->permission_name }}"
|
||||
class="permission-cb"
|
||||
data-perm-id="{{ $perm->permission_id }}"
|
||||
@if($perm->has_permission) checked @endif autocomplete="off">
|
||||
@if($perm->has_permission) checked @endif
|
||||
@if(isset($permParent) && $permParent->has_permission) disabled @endif>
|
||||
{{ $__t($perm->permission_name) }}
|
||||
</label>
|
||||
<div id="permission-sub-{{ $perm->permission_name }}">
|
||||
@@ -11,7 +12,8 @@
|
||||
@foreach($perm->uihelper_user_permissionsList(array('user_id' => $user->id))->via('parent') as $p)
|
||||
<li>
|
||||
@include('components.userpermission_select', array(
|
||||
'perm' => $p
|
||||
'perm' => $p,
|
||||
'permParent' => $perm
|
||||
))
|
||||
</li>
|
||||
@endforeach
|
||||
|
Reference in New Issue
Block a user