github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-05 12:26:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into modernjs

Browse Source
This commit is contained in:
Katharina Bogad 2021-06-24 10:08:11 +02:00
commit b3366366b5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/datetimepicker.js
View File

@ -297,7 +297,7 @@ class datetimepicker
EmptyElementWhenMatches(this.$('#' + this.basename + '-timeago'), this.Grocy.translate('timeago_nan')); EmptyElementWhenMatches(this.$('#' + this.basename + '-timeago'), this.Grocy.translate('timeago_nan'));
// TODO: scoping // TODO: scoping
RefreshContextualTimeago("#" + this.basename + "-wrapper"); RefreshContextualTimeago("." + this.basename + "-wrapper");
} }
stateTrigger() stateTrigger()

2
views/components/datetimepicker2.blade.php
View File

@ -11,7 +11,7 @@
@php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp @php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp
@php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp @php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp
<div id="datetimepicker2-wrapper" <div class="datetimepicker2-wrapper"
class="form-group {{ $additionalGroupCssClasses }}"> class="form-group {{ $additionalGroupCssClasses }}">
<label for="{{ $id }}">{{ $__t($label) }} <label for="{{ $id }}">{{ $__t($label) }}
@if(!empty($hint)) @if(!empty($hint))