Skip to content
Snippets Groups Projects
Commit 7b085640 authored by Rasmus Fuhse's avatar Rasmus Fuhse
Browse files

Resolve "Neue Adminseite - Keine Meldung, dass zu viele Veranstaltung im...

Resolve "Neue Adminseite - Keine Meldung, dass zu viele Veranstaltung im Hintergrund ausgelesen werden."

Closes #2852

Merge request studip/studip!2060
parent ca4cf76c
No related branches found
No related tags found
No related merge requests found
...@@ -75,12 +75,12 @@ ...@@ -75,12 +75,12 @@
<td class="actions" v-html="course.action"> <td class="actions" v-html="course.action">
</td> </td>
</tr> </tr>
<tr v-if="sortedCourses.length === 0 && coursesCount <= 500 && displayLimitedLines && coursesLoaded"> <tr v-if="coursesCount === 0 && coursesLoaded">
<td :colspan="colspan"> <td :colspan="colspan">
{{ $gettext('Keine Ergebnisse') }} {{ $gettext('Keine Ergebnisse') }}
</td> </td>
</tr> </tr>
<tr v-if="coursesCount > maxCourses && displayLimitedLines"> <tr v-if="coursesCount > 0 && sortedCourses.length === 0">
<td :colspan="colspan"> <td :colspan="colspan">
{{ {{
$gettextInterpolate( $gettextInterpolate(
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
{ n: coursesCount } { n: coursesCount }
) )
}} }}
<a href="" @click.prevent="loadCourses({withoutLimit: true}); displayLimitedLines = false;"> <a href="" @click.prevent="loadCourses({withoutLimit: true});">
{{ $gettext('Alle anzeigen') }} {{ $gettext('Alle anzeigen') }}
</a> </a>
</td> </td>
...@@ -130,7 +130,6 @@ export default { ...@@ -130,7 +130,6 @@ export default {
direction: this.sortFlag, direction: this.sortFlag,
}, },
currentLine: null, currentLine: null,
displayLimitedLines: true,
open_children: [], open_children: [],
}; };
}, },
......
...@@ -44,9 +44,9 @@ export default { ...@@ -44,9 +44,9 @@ export default {
state.courses.push(payload.data); state.courses.push(payload.data);
} }
}, },
setCourses(state, courses, count = null) { setCourses(state, payload) {
state.courses = courses; state.courses = payload.courses;
state.coursesCount = count ?? courses.length; state.coursesCount = payload.count ?? payload.courses.length;
}, },
setCoursesLoaded(state, loaded = true) { setCoursesLoaded(state, loaded = true) {
state.coursesLoaded = loaded; state.coursesLoaded = loaded;
...@@ -109,9 +109,14 @@ export default { ...@@ -109,9 +109,14 @@ export default {
commit('setCoursesLoaded'); commit('setCoursesLoaded');
if (response.data === undefined) { if (response.data === undefined) {
commit('setCourses', [], response.count); commit('setCourses', {
courses: [],
count: response.count
});
} else { } else {
commit('setCourses', response.data); commit('setCourses', {
courses: response.data
});
} }
commit('setButtons', { commit('setButtons', {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment