maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix deprecated jquery calls; move editapikey jq call to Ajax.php; fix edit of apikeys::allowed_from and allow cidr

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-04-22 13:17:09 +02:00
parent a615b04eb4
commit 8c1621cced
20 changed files with 168 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/formfields/formfield.api_key.php
View File

@@ -40,15 +40,15 @@ return [
'value' => $result['secret']
],
'allowed_from' => [
'label' => UI::getLng('apikeys.allowed_from'),
'label' => ['title' => UI::getLng('apikeys.allowed_from'), 'description' => UI::getLng('apikeys.allowed_from_help')],
'type' => 'text',
'value' => $result['allowed_from'],
],
'valid_until' => [
'label' => UI::getLng('apikeys.valid_until'),
'label' => ['title' => UI::getLng('apikeys.valid_until'), 'description' => UI::getLng('apikeys.valid_until_help')],
/** @TODO datetime-picker */
'type' => 'text',
'value' => $result['valid_until'],
'format_callback' => [Text::class, 'timestampUntil'],
'value' => $result['valid_until'] < 0 ? "" : $result['valid_until']
]
]
]