mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-20 00:12:15 +00:00
fix back button behavior in studvw and lvverwaltung
This commit is contained in:
@@ -124,6 +124,10 @@ export default {
|
||||
? `${this.stg}/${this.semester}`
|
||||
: this.stg;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.selectedStudiengang = '';
|
||||
}
|
||||
this.filter = filter;
|
||||
},
|
||||
handleRowClicked(data)
|
||||
@@ -163,6 +167,7 @@ export default {
|
||||
const routeName = this.filter.emp ? 'byEmp' : 'byStg';
|
||||
const params = { stg };
|
||||
|
||||
params.semester = '';
|
||||
if (semester !== null)
|
||||
params.semester = semester;
|
||||
if (studiensemester_kurzbz)
|
||||
@@ -281,7 +286,7 @@ export default {
|
||||
<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
|
||||
</div>
|
||||
<stv-verband :preselectedKey="selectedStudiengang" :endpoint="endpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
|
||||
<stv-studiensemester v-model:studiensemester-kurzbz="selectedStudiensemester" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
|
||||
<stv-studiensemester vnull-model:studiensemester-kurzbz="selectedStudiensemester" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
|
||||
</nav>
|
||||
|
||||
<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
|
||||
|
||||
@@ -356,6 +356,18 @@ export default {
|
||||
});
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
this.studiengangKz = undefined;
|
||||
this.studiengangKuerzel = '';
|
||||
if(['index', 'studiensemester'].includes(this.$route.name))
|
||||
{
|
||||
if(this.$refs?.stvList?.$refs?.table?.tabulator)
|
||||
{
|
||||
this.$refs.stvList.$refs.table.tabulator.setData([]);
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
onSearch(e) {
|
||||
const searchsettings = { ...this.$refs.searchbar.searchsettings };
|
||||
@@ -585,7 +597,7 @@ export default {
|
||||
<div class="offcanvas-header justify-content-end px-1 d-md-none">
|
||||
<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
|
||||
</div>
|
||||
<stv-verband :preselectedKey="'' + studiengangKz" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
|
||||
<stv-verband :preselectedKey="studiengangKz ? '' + studiengangKz : null" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
|
||||
<stv-studiensemester v-model:studiensemester-kurzbz="studiensemesterKurzbz" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
|
||||
</nav>
|
||||
<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
|
||||
|
||||
@@ -16,14 +16,17 @@ export default {
|
||||
inject: {
|
||||
$reloadList: {
|
||||
from: '$reloadList',
|
||||
required: true
|
||||
default: () => {}
|
||||
},
|
||||
currentSemester: {
|
||||
from: 'currentSemester',
|
||||
required: true
|
||||
},
|
||||
appConfig: {
|
||||
from: 'appConfig'
|
||||
from: 'appConfig',
|
||||
default: {
|
||||
number_displayed_past_studiensemester: 5
|
||||
}
|
||||
}
|
||||
},
|
||||
emits: [
|
||||
@@ -208,22 +211,25 @@ export default {
|
||||
if (!currentNode)
|
||||
return;
|
||||
|
||||
const currentSelectedKey = Object.keys(this.selectedKey).find(Boolean);
|
||||
if (currentSelectedKey) {
|
||||
if (currentSelectedKey == currentKey)
|
||||
return;
|
||||
/**
|
||||
* Do not select a new entry if the current is a child of the new one.
|
||||
* This happens if a child entry of a new stg is selected and the router
|
||||
* tries to select the stg root entry (because subtrees do not have
|
||||
* routes yet)
|
||||
*/
|
||||
const isChild = this.findNodeByKey(
|
||||
currentSelectedKey,
|
||||
currentNode.children
|
||||
);
|
||||
if (isChild)
|
||||
return;
|
||||
if(this.selectedKey)
|
||||
{
|
||||
const currentSelectedKey = Object.keys(this.selectedKey).find(Boolean);
|
||||
if (currentSelectedKey) {
|
||||
if (currentSelectedKey == currentKey)
|
||||
return;
|
||||
/**
|
||||
* Do not select a new entry if the current is a child of the new one.
|
||||
* This happens if a child entry of a new stg is selected and the router
|
||||
* tries to select the stg root entry (because subtrees do not have
|
||||
* routes yet)
|
||||
*/
|
||||
const isChild = this.findNodeByKey(
|
||||
currentSelectedKey,
|
||||
currentNode.children || []
|
||||
);
|
||||
if (isChild)
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
for (let i = 1; i < parts.length; i++)
|
||||
|
||||
Reference in New Issue
Block a user