kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-14 17:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Added new Userfield type "Link (with title)" (closes #790)

Browse Source
This commit is contained in:
Bernd Bestel
2020-12-21 17:57:48 +01:00
parent e97fccd03a
commit 431a2ab9f7
8 changed files with 93 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
views/components/userfields_tbody.blade.php
View File

@@ -13,6 +13,19 @@
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_LINK)
<a href="{{ $userfieldObject->value }}"
target="_blank">{{ $userfieldObject->value }}</a>
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_LINK_WITH_TITLE)
@php
$title = '';
$link = '';
if(!empty($userfieldObject->value))
{
$data = json_decode($userfieldObject->value);
$title = $data->title;
$link = $data->link;
}
@endphp
<a href="{{ $link }}"
target="_blank">{{ $title }}</a>
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_FILE)
<a href="{{ $U('/files/userfiles/'. $userfieldObject->value) }}"
target="_blank">{{ base64_decode(explode('_', $userfieldObject->value)[1]) }}</a>

24
views/components/userfieldsform.blade.php
View File

@@ -14,7 +14,7 @@
@if($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_SINGLE_LINE_TEXT)
<div class="form-group">
<label for="name">{{ $userfield->caption }}</label>
<label>{{ $userfield->caption }}</label>
<input type="text"
class="form-control userfield-input"
data-userfield-name="{{ $userfield->name }}">
@@ -112,11 +112,31 @@
</div>
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_LINK)
<div class="form-group">
<label for="name">{{ $userfield->caption }}</label>
<label>{{ $userfield->caption }}</label>
<input type="link"
class="form-control userfield-input"
data-userfield-name="{{ $userfield->name }}">
</div>
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_LINK_WITH_TITLE)
<div class="form-group">
<label class="d-block">{{ $userfield->caption }}</label>
<div class="form-row">
<div class="col-4">
<input type="text"
class="form-control userfield-link userfield-link-title"
placeholder="{{ $__t('Title') }}">
</div>
<div class="col-8">
<input type="link"
class="form-control userfield-link userfield-link-link"
placeholder="{{ $__t('Link') }}">
</div>
<input data-userfield-type="link"
type="hidden"
class="userfield-input"
data-userfield-name="{{ $userfield->name }}">
</div>
</div>
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_FILE)
<div class="form-group">
<label>{{ $userfield->caption }}</label>