blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-11 09:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Downloadlink erzeugt nach Page Reload keine Fehlermeldung mehr

Browse Source
This commit is contained in:
Cris
2022-11-29 18:10:39 +01:00
parent 7cdb7688c4
commit ca217f1869
4 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+1 -5
View File
@@ -213,11 +213,7 @@ $filterWidgetArray = array(
begruendung: {headerFilter:"input", visible: true},
student: {headerFilter:"input"},
zgv: {visible: false, headerFilter:"input"},
dokument_bezeichnung: {headerFilter:"input", formatter:"link", formatterParams:{
labelField:"dokument_bezeichnung",
url:function(cell){return "'. current_url() .'/download?dms_id=" + cell.getData().dms_id},
target:"_blank"
}},
dokument_bezeichnung: {headerFilter:"input", formatter:"link", formatterParams: paramLookup_dokBez},
anmerkung_student: {headerFilter:"input"},
antragsdatum: {align:"center", headerFilter:"input", mutator: mut_formatStringDate},
empfehlung_anrechnung: {headerFilter:"input", align:"center", formatter: format_empfehlung_anrechnung, headerFilterFunc: hf_filterTrueFalse},
application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
+1 -5
View File
@@ -134,11 +134,7 @@ $filterWidgetArray = array(
student: {headerFilter:"input"},
begruendung: {headerFilter:"input"},
zgv: {visible: false, headerFilter:"input"},
dokument_bezeichnung: {headerFilter:"input", formatter:"link", formatterParams:{
labelField:"dokument_bezeichnung",
url:function(cell){return "'. current_url() .'/download?dms_id=" + cell.getData().dms_id},
target:"_blank"
}},
dokument_bezeichnung: {headerFilter:"input", formatter:"link", formatterParams: paramLookup_dokBez},
anmerkung_student: {headerFilter:"input"},
antragsdatum: {align:"center", headerFilter:"input", mutator: mut_formatStringDate},
empfehlung_anrechnung: {headerFilter:"input", align:"center", formatter: format_empfehlung_anrechnung, headerFilterFunc: hf_filterTrueFalse},
public/js/lehre/anrechnung/approveAnrechnungUebersicht.js
+14
View File
@@ -1,4 +1,6 @@
const BASE_URL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
const CALLED_PATH = FHC_JS_DATA_STORAGE_OBJECT.called_path;
const CONTROLLER_URL = BASE_URL + '/' + CALLED_PATH;
const APPROVE_ANRECHNUNG_DETAIL_URI = "lehre/anrechnung/ApproveAnrechnungDetail";
const ANRECHNUNGSTATUS_PROGRESSED_BY_STGL = 'inProgressDP';
@@ -203,6 +205,18 @@ var format_empfehlung_anrechnung = function(cell, formatterParams){
: FHC_PhrasesLib.t("ui", "nein");
}
/**
* Returns formatter params for field dokument_bezeichnung (= Spalte Nachweisdokumente)
* NOTE: Returning a formatter param object fixes the problem, that tabulator did not know the url after refreshing the page.
*/
function paramLookup_dokBez(cell){
return {
labelField: 'dokument_bezeichnung',
url: CONTROLLER_URL + '/download?dms_id=' + cell.getData().dms_id,
target: '_blank'
}
}
/*
* Hook to overwrite TableWigdgets select-all-button behaviour
* Select all (filtered) rows that are progressed by stg leiter.
public/js/lehre/anrechnung/reviewAnrechnungUebersicht.js
+14
View File
@@ -1,4 +1,6 @@
const BASE_URL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
const CALLED_PATH = FHC_JS_DATA_STORAGE_OBJECT.called_path;
const CONTROLLER_URL = BASE_URL + '/' + CALLED_PATH;
const APPROVE_ANRECHNUNG_DETAIL_URI = "lehre/anrechnung/ReviewAnrechnungDetail";
const ANRECHNUNGSTATUS_PROGRESSED_BY_STGL = 'inProgressDP';
@@ -121,6 +123,18 @@ var format_empfehlung_anrechnung = function(cell, formatterParams){
: FHC_PhrasesLib.t("ui", "nein");
}
/**
* Returns formatter params for field dokument_bezeichnung (= Spalte Nachweisdokumente)
* NOTE: Returning a formatter param object fixes the problem, that tabulator did not know the url after refreshing the page.
*/
function paramLookup_dokBez(cell){
return {
labelField: 'dokument_bezeichnung',
url: CONTROLLER_URL + '/download?dms_id=' + cell.getData().dms_id,
target: '_blank'
}
}
/*
* Hook to overwrite TableWigdgets select-all-button behaviour
* Select all (filtered) rows that are progressed by stg leiter.