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

Fixed (broken by myself) link-return handling

Browse Source
This commit is contained in:
Bernd Bestel 2020-08-31 19:02:35 +02:00
parent ddfe608ec6
commit 849d3dd0ca
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/js/grocy.js
View File

@ -670,7 +670,7 @@ $(Grocy.UserPermissions).each(function (index, item)
$('.permission-'+item.permission_name).addClass('disabled').addClass('not-allowed'); $('.permission-'+item.permission_name).addClass('disabled').addClass('not-allowed');
} }
}); });
$('a.link-return').each(function () { $('a.link-return').not(".btn").each(function () {
var base = $(this).data('href'); var base = $(this).data('href');
if(base.contains('?')) if(base.contains('?'))
{ {
@ -681,3 +681,18 @@ $('a.link-return').each(function () {
} }
}) })
$(document).on("click", "a.btn.link-return", function(e)
{
e.preventDefault();
var link = GetUriParam("returnto");
if (!link || !link.length > 0)
{
location.href = $(e.currentTarget).attr("href");
}
else
{
location.href = U(link);
}
});

2
views/usersettings.blade.php
View File

@ -24,7 +24,7 @@
</select> </select>
</div> </div>
<a href="{{ $U('/') }}" class="btn btn-success">{{ $__t('OK') }}</a> <a href="{{ $U('/') }}" class="btn btn-success link-return">{{ $__t('OK') }}</a>
</div> </div>
</div> </div>
@stop @stop