blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-10-12 15:04:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/76688-general-tabulator-issues_77080-persistence' into studvw_lvvw_2026_08_rc_77973_76688

Browse Source
This commit is contained in:
Harald Bamberger
2026-08-03 17:04:34 +02:00
parent bf6b588675 b427788e04
commit b7a2198057
3 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/TabulatorPresets.php
+4 -4
View File
@@ -49,7 +49,7 @@ class TabulatorPresets extends FHCAPI_Controller
{ {
$tableName = $this->input->get("tableName"); $tableName = $this->input->get("tableName");
if (!$tableName) { if (!$tableName) {
$this->terminateWithError(error($this->p->t("global", "invalid_params_err_msg"))); $this->terminateWithError(error($this->p->t("tabulator_presets", "invalid_params_err_msg")));
} }
$uid = getAuthUID(); $uid = getAuthUID();
@@ -66,7 +66,7 @@ class TabulatorPresets extends FHCAPI_Controller
$preset = $this->input->post("preset"); $preset = $this->input->post("preset");
if (!$tableName || !$presetName || !$preset) { if (!$tableName || !$presetName || !$preset) {
$this->terminateWithError($this->p->t("global", "invalid_params_err_msg"), "general", 400); $this->terminateWithError($this->p->t("tabulator_presets", "invalid_params_err_msg"), "general", 400);
} }
$uid = getAuthUID(); $uid = getAuthUID();
@@ -105,7 +105,7 @@ class TabulatorPresets extends FHCAPI_Controller
$preset = $this->input->post("preset"); $preset = $this->input->post("preset");
if (!$presetId || !$preset) { if (!$presetId || !$preset) {
$this->terminateWithError($this->p->t("global", "invalid_params_err_msg"), "general", 400); $this->terminateWithError($this->p->t("tabulator_presets", "invalid_params_err_msg"), "general", 400);
} }
$existingPresetData = $this->TabulatorPresetModel->getTabulatorPreset($presetId); $existingPresetData = $this->TabulatorPresetModel->getTabulatorPreset($presetId);
@@ -136,7 +136,7 @@ class TabulatorPresets extends FHCAPI_Controller
{ {
$presetId = $this->input->post("presetId"); $presetId = $this->input->post("presetId");
if (!$presetId) { if (!$presetId) {
$this->terminateWithError($this->p->t("global", "invalid_params_err_msg"), "general", 400); $this->terminateWithError($this->p->t("tabulator_presets", "invalid_params_err_msg"), "general", 400);
} }
$presetData = $this->TabulatorPresetModel->getTabulatorPreset($presetId); $presetData = $this->TabulatorPresetModel->getTabulatorPreset($presetId);
public/js/components/filter/Filter.js
+1 -1
View File
@@ -1123,7 +1123,7 @@ export const CoreFilterCmpt = {
class="fw-bold" class="fw-bold"
> >
{{ appliedPreset.name }} {{ appliedPreset.name }}
<span v-if="hasPresetBeenModified"> {{ " [" + $p.t("global/modified") + "]" }} </span> <span v-if="hasPresetBeenModified"> {{ " [" + $p.t("tabulator_presets/modified") + "]" }} </span>
</span> </span>
<table-download class="btn btn-link px-0 fhc-text" :tabulator="tabulator" :config="download"></table-download> <table-download class="btn btn-link px-0 fhc-text" :tabulator="tabulator" :config="download"></table-download>
<slot name="additional"></slot> <slot name="additional"></slot>
system/phrasesupdate.php
+40
View File
@@ -62082,6 +62082,46 @@ I have been informed that I am under no obligation to consent to the transmissio
) )
) )
), ),
array(
'app' => 'core',
'category' => 'tabulator_presets',
'phrase' => 'invalid_params_err_msg',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Ungültige Parameterübergabe!',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Invalid parameters!',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'tabulator_presets',
'phrase' => 'modified',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'modifiziert',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'modified',
'description' => '',
'insertvon' => 'system'
)
)
),
// tabulator presets section phrases END // tabulator presets section phrases END
); );