MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing issue with cypress test, fixing a 409 conflict that could occur in table saving - shouldn't happen now.

This commit is contained in:
mike12345567 2021-02-16 18:29:38 +00:00
parent ad49a428b5
commit 1e39a873b2
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/src/components/backend/DataTable/DataTable.svelte
View File

@ -13,7 +13,7 @@
import CreateEditUser from "./modals/CreateEditUser.svelte" import CreateEditUser from "./modals/CreateEditUser.svelte"
import CreateEditRow from "./modals/CreateEditRow.svelte" import CreateEditRow from "./modals/CreateEditRow.svelte"
let hideAutocolumns let hideAutocolumns = true
let data = [] let data = []
let loading = false let loading = false
$: isUsersTable = $backendUiStore.selectedTable?._id === TableNames.USERS $: isUsersTable = $backendUiStore.selectedTable?._id === TableNames.USERS

2
packages/builder/src/components/backend/DataTable/Table.svelte
View File

@ -24,7 +24,7 @@
export let allowEditing = false export let allowEditing = false
export let loading = false export let loading = false
export let theme = "alpine" export let theme = "alpine"
export let hideAutocolumns = false export let hideAutocolumns
let columnDefs = [] let columnDefs = []
let selectedRows = [] let selectedRows = []

2
packages/builder/src/components/backend/DataTable/buttons/HideAutocolumnButton.svelte
View File

@ -1,7 +1,7 @@
<script> <script>
import { TextButton } from "@budibase/bbui" import { TextButton } from "@budibase/bbui"
export let hideAutocolumns = true export let hideAutocolumns
let anchor let anchor
let dropdown let dropdown

2
packages/server/src/api/controllers/table.js
View File

@ -70,6 +70,8 @@ exports.save = async function(ctx) {
let oldTable let oldTable
if (ctx.request.body && ctx.request.body._id) { if (ctx.request.body && ctx.request.body._id) {
oldTable = await db.get(ctx.request.body._id) oldTable = await db.get(ctx.request.body._id)
// update _rev just to make sure its always accurate
tableToSave._rev = oldTable._rev
} }
// make sure that types don't change of a column, have to remove // make sure that types don't change of a column, have to remove