Skip to content

Commit b9c4872

Browse files
committed
fix(table/view): always render MainModals for proper nav and creation btns
Signed-off-by: silver <s.szmajduch@posteo.de>
1 parent 8783786 commit b9c4872

2 files changed

Lines changed: 12 additions & 10 deletions

File tree

src/pages/Table.vue

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
-->
55
<template>
66
<div class="main-table-view">
7-
<ErrorMessage v-if="errorMessage" :message="errorMessage" />
8-
9-
<div v-else-if="!activeTable">
7+
<div v-if="!activeTable && !errorMessage">
108
<div class="icon-loading" />
119
</div>
1210

13-
<div v-else>
11+
<div v-else-if="activeTable">
1412
<MainWrapper :element="activeTable" :is-view="false" />
15-
<MainModals />
1613
</div>
14+
15+
<ErrorMessage v-else-if="errorMessage" :message="errorMessage" />
16+
17+
<MainModals />
1718
</div>
1819
</template>
1920

src/pages/View.vue

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
-->
55
<template>
66
<div class="main-view-view">
7-
<ErrorMessage v-if="errorMessage" :message="errorMessage" />
8-
9-
<div v-else-if="!activeView">
7+
<div v-if="!activeView && !errorMessage">
108
<div class="icon-loading" />
119
</div>
1210

13-
<div v-else>
11+
<div v-else-if="activeView">
1412
<MainWrapper :element="activeView" :is-view="true" />
15-
<MainModals />
1613
</div>
14+
15+
<ErrorMessage v-else-if="errorMessage" :message="errorMessage" />
16+
17+
<MainModals />
1718
</div>
1819
</template>
1920

0 commit comments

Comments
 (0)