diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php index b524451cb..bc4494f57 100644 --- a/application/models/person/Notiz_model.php +++ b/application/models/person/Notiz_model.php @@ -198,7 +198,7 @@ class Notiz_model extends DB_Model z.$type = ?"; if ($withoutTags) - $qry .= " AND tbl_notiz.typ IS NULL"; + $qry .= " AND n.typ IS NULL "; $qry .= "GROUP BY notiz_id, z.notizzuordnung_id, diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js index faecbf71f..e9d132848 100644 --- a/public/js/components/LVVerwaltung/LVVerwaltung.js +++ b/public/js/components/LVVerwaltung/LVVerwaltung.js @@ -119,6 +119,12 @@ export default { activeFilter: this.emp ? 'employee' : this.stg ? 'verband' : null } + if (this.stg !== undefined) + { + this.selectedStudiengang = this.semester !== '' && this.semester + ? `${this.stg}/${this.semester}` + : this.stg; + } this.filter = filter; }, handleRowClicked(data) @@ -164,7 +170,6 @@ export default { params.studiensemester_kurzbz = studiensemester_kurzbz; if (this.filter.emp) params.emp = this.filter.emp; - this.$router.push({ name: routeName, params }); this.selected = []; }, @@ -191,13 +196,6 @@ export default { }, }, created() { - if (this.stg !== undefined) - { - this.selectedStudiengang = this.semester !== '' && this.semester - ? `${this.stg}/${this.semester}` - : this.stg; - } - this.$p.loadCategory(['lehre', 'person', 'global']) this.$api.call(ApiDetails.getStudiensemester()) @@ -261,7 +259,7 @@ export default {