Rename concurrencyToken to concurrency

This commit is contained in:
2020-05-13 19:55:50 +00:00
parent c9b5df20af
commit 6e41dad1b0
10 changed files with 26 additions and 26 deletions

View File

@@ -130,7 +130,7 @@ export default {
return {
obj: {
id: null,
concurrencyToken: null,
concurrency: null,
template: null
},
selectLists: {

View File

@@ -104,7 +104,7 @@ export default {
return {
enableCypress: true,
obj: [],
concurrencyToken: undefined,
concurrency: undefined,
formCustomTemplateKey: this.$route.params.formCustomTemplateKey,
selectLists: {
uiFieldDataTypes: []
@@ -182,7 +182,7 @@ export default {
//Note that server expects to see a string array of json template, not actual json
let newObj = {
formKey: vm.formCustomTemplateKey,
concurrencyToken: vm.concurrencyToken,
concurrency: vm.concurrency,
template: "[]"
};
//temporary array to hold template for later stringification
@@ -233,11 +233,11 @@ export default {
//(update our local cached copy of the form customizations)
window.$gz.formCustomTemplate.set(
vm.formCustomTemplateKey,
res.data.concurrencyToken,
res.data.concurrency,
newObj.template
);
//set our local concurrency token value
vm.concurrencyToken = res.data.concurrencyToken;
vm.concurrency = res.data.concurrency;
//form is now clean
window.$gz.form.setFormState({
@@ -435,7 +435,7 @@ function initDataObject(vm) {
};
vm.obj.push(objItem);
vm.concurrencyToken = window.$gz.formCustomTemplate.getTemplateConcurrencyToken(
vm.concurrency = window.$gz.formCustomTemplate.getTemplateConcurrencyToken(
vm.formCustomTemplateKey
);
}

View File

@@ -459,7 +459,7 @@ export default {
editView: [],
name: "",
public: true,
concurrencyToken: 0,
concurrency: 0,
userId: 0
},
listViewId: undefined,
@@ -467,7 +467,7 @@ export default {
formKey: undefined,
fieldDefinitions: [],
effectiveListView: undefined,
concurrencyToken: undefined,
concurrency: undefined,
selectLists: {
dateFilterOperators: [],
dateFilterTokens: [],
@@ -703,7 +703,7 @@ export default {
//are we working off a pre-existing listview (save over)?
if (vm.listViewId > 0) {
lvSave.id = vm.listViewId;
lvSave.concurrencyToken = vm.obj.concurrencyToken;
lvSave.concurrency = vm.obj.concurrency;
url = url + vm.listViewId;
}
@@ -746,7 +746,7 @@ export default {
);
} else {
//Handle "put" of an existing record (UPDATE)
vm.obj.concurrencyToken = res.data.concurrencyToken;
vm.obj.concurrency = res.data.concurrency;
window.$gz.form.setFormState({
vm: vm,
dirty: false
@@ -838,7 +838,7 @@ export default {
//Set some values that otherwise don't get updated because we're not really navigating fresh
vm.obj.name = res.data.name;
vm.obj.concurrencyToken = res.data.concurrencyToken;
vm.obj.concurrency = res.data.concurrency;
vm.listViewId = res.data.id;
//Navigate to new record
//NOTE: this doesn't really update the form at all so need to set some th9ings
@@ -1237,7 +1237,7 @@ function setEffectiveListView(vm) {
vm.effectiveListView = JSON.parse(res.data.listView);
vm.obj.public = res.data.public;
vm.obj.name = res.data.name;
vm.obj.concurrencyToken = res.data.concurrencyToken;
vm.obj.concurrency = res.data.concurrency;
vm.obj.userId = res.data.userId;
}
});

View File

@@ -159,7 +159,7 @@ export default {
translations: []
},
obj: {
/*concurrencyToken": 7490431,
/*concurrency": 7490431,
"translationId": 1,
"emailAddress": null,
"uiColor": "#000000",
@@ -169,7 +169,7 @@ export default {
"hour12": true,
"userId": 1 */
id: 0,
concurrencyToken: 0,
concurrency: 0,
emailAddress: null,
uiColor: null,
languageOverride: null,
@@ -302,7 +302,7 @@ export default {
//UserOptions is never a POST as it always exists and can't be deleted so always a PUT
//Handle "put" of an existing record (UPDATE)
vm.obj.concurrencyToken = res.data.concurrencyToken;
vm.obj.concurrency = res.data.concurrency;
window.$gz.form.setFormState({
vm: vm,
dirty: false

View File

@@ -186,7 +186,7 @@ export default {
//UserOptions is never a POST as it always exists and can't be deleted so always a PUT
//Handle "put" of an existing record (UPDATE)
vm.obj.concurrencyToken = res.data.concurrencyToken;
vm.obj.concurrency = res.data.concurrency;
window.$gz.form.setFormState({
vm: vm,
dirty: false

View File

@@ -324,7 +324,7 @@ export default {
//IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
//I.E. Serial, usertype fields
id: 0,
concurrencyToken: 0,
concurrency: 0,
name: null,
serial: 0,
dollarAmount: null,
@@ -491,7 +491,7 @@ export default {
);
} else {
//Handle "put" of an existing record (UPDATE)
vm.obj.concurrencyToken = res.data.concurrencyToken;
vm.obj.concurrency = res.data.concurrency;
window.$gz.form.setFormState({
vm: vm,
dirty: false