Skip to content

Commit

Permalink
Merge pull request #17722 from guerler/fix_pagination
Browse files Browse the repository at this point in the history
[24.0] Always display grid pagination on the right
  • Loading branch information
mvdbeek authored Mar 15, 2024
2 parents 5c9e2c1 + 1121548 commit ed06985
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions client/src/components/Grid/GridList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ watch(operationMessage, () => {
</table>
<div class="flex-grow-1 h-100" />
<div class="grid-footer">
<div v-if="isAvailable && gridConfig.batch" class="d-flex justify-content-between pt-3">
<div v-if="isAvailable" class="d-flex justify-content-between pt-3">
<div class="d-flex">
<div v-for="(batchOperation, batchIndex) in gridConfig.batch" :key="batchIndex">
<BButton
Expand All @@ -383,9 +383,6 @@ watch(operationMessage, () => {
</div>
<BPagination v-model="currentPage" :total-rows="totalRows" :per-page="limit" class="m-0" size="sm" />
</div>
<div v-else-if="isAvailable" class="d-flex justify-content-center pt-3">
<BPagination v-model="currentPage" :total-rows="totalRows" :per-page="limit" class="m-0" size="sm" />
</div>
</div>
</div>
</template>
Expand All @@ -402,6 +399,7 @@ watch(operationMessage, () => {
top: 0;
}
.grid-sticky {
left: 0;
z-index: 2;
background: $white;
opacity: 0.95;
Expand Down

0 comments on commit ed06985

Please sign in to comment.