This commit is contained in:
2022-12-24 20:24:52 +00:00
parent 84d55331ea
commit e59e2c142e
3 changed files with 23 additions and 16 deletions

View File

@@ -221,6 +221,13 @@ export default {
}); });
break; break;
case socktype.Vendor:
vm.$router.push({
name: "vendor-edit",
params: { recordid: tid.id }
});
break;
default: default:
window.$gz.eventBus.$emit( window.$gz.eventBus.$emit(
"notify-warning", "notify-warning",

View File

@@ -50,7 +50,7 @@ export default {
errorMessages: { type: Array, default: null }, errorMessages: { type: Array, default: null },
readonly: { type: Boolean, default: false }, readonly: { type: Boolean, default: false },
disabled: { type: Boolean, default: false }, disabled: { type: Boolean, default: false },
sockType: { ayaType: {
type: Number, type: Number,
default: 0 default: 0
}, },
@@ -94,7 +94,7 @@ export default {
}; };
}, },
watch: { watch: {
sockType(val, oldVal) { ayaType(val, oldVal) {
if (val != oldVal && oldVal != null) { if (val != oldVal && oldVal != null) {
//change of type so clear out the list //change of type so clear out the list
this.searchResults = []; this.searchResults = [];
@@ -166,7 +166,7 @@ export default {
idToOpen = this.lastSelection.id; idToOpen = this.lastSelection.id;
} }
window.$gz.eventBus.$emit("openobject", { window.$gz.eventBus.$emit("openobject", {
type: this.sockType, type: this.ayaType,
id: idToOpen id: idToOpen
}); });
}, },
@@ -201,7 +201,7 @@ export default {
window.$gz.form.addNoSelectionItem(this.searchResults, true); window.$gz.form.addNoSelectionItem(this.searchResults, true);
} else { } else {
const pickListParams = { const pickListParams = {
sockType: this.sockType, sockType: this.ayaType,
preselectedIds: [this.value] preselectedIds: [this.value]
}; };
if (this.variant != null) { if (this.variant != null) {
@@ -265,7 +265,7 @@ export default {
//default params for when called on init //default params for when called on init
if (!pickListParams) { if (!pickListParams) {
pickListParams = { pickListParams = {
sockType: this.sockType ayaType: this.ayaType
}; };
if (this.value != null) { if (this.value != null) {
pickListParams["preselectedIds"] = [this.value]; pickListParams["preselectedIds"] = [this.value];
@@ -370,7 +370,7 @@ export default {
} }
//build parameter //build parameter
const pickListParams = { sockType: vm.sockType }; const pickListParams = { ayaType: vm.ayaType };
if (!emptyQuery) { if (!emptyQuery) {
let query = queryTerms[0]; let query = queryTerms[0];
if (queryTerms[1] != "[?]") { if (queryTerms[1] != "[?]") {

View File

@@ -305,7 +305,7 @@ namespace Sockeye.Util
CREATE OR REPLACE PROCEDURE public.aydosearchindex( CREATE OR REPLACE PROCEDURE public.aydosearchindex(
wordlist TEXT[], wordlist TEXT[],
ayobjectid BIGINT, ayobjectid BIGINT,
socktype INTEGER, stype INTEGER,
cleanfirst boolean) cleanfirst boolean)
LANGUAGE 'plpgsql' LANGUAGE 'plpgsql'
@@ -317,12 +317,12 @@ BEGIN
RAISE EXCEPTION 'Bad object id --> %', ayobjectid; RAISE EXCEPTION 'Bad object id --> %', ayobjectid;
END IF; END IF;
IF socktype=0 THEN IF stype=0 THEN
RAISE EXCEPTION 'Bad object type --> %', socktype; RAISE EXCEPTION 'Bad object type --> %', stype;
END IF; END IF;
IF cleanfirst=true THEN IF cleanfirst=true THEN
delete from asearchkey where objectid=ayobjectid and sockType=socktype; delete from asearchkey where objectid=ayobjectid and sockType=stype;
END IF; END IF;
FOREACH s IN ARRAY wordlist FOREACH s IN ARRAY wordlist
@@ -330,9 +330,9 @@ BEGIN
SELECT id INTO wordid FROM asearchdictionary WHERE word = s; SELECT id INTO wordid FROM asearchdictionary WHERE word = s;
IF wordid IS NULL THEN IF wordid IS NULL THEN
insert into asearchdictionary (word) values(s) on conflict (word) do update set word=excluded.word returning id into wordid; insert into asearchdictionary (word) values(s) on conflict (word) do update set word=excluded.word returning id into wordid;
insert into asearchkey (wordid,objectid,sockType) values(wordid,ayobjectid,socktype); insert into asearchkey (wordid,objectid,sockType) values(wordid,ayobjectid,stype);
ELSE ELSE
insert into asearchkey (wordid,objectid,sockType) values(wordid,ayobjectid,socktype); insert into asearchkey (wordid,objectid,sockType) values(wordid,ayobjectid,stype);
END IF; END IF;
END LOOP; END LOOP;
END; END;
@@ -342,14 +342,14 @@ $BODY$;
//Original Name fetcher function, superseded by later updates //Original Name fetcher function, superseded by later updates
await ExecQueryAsync(@" await ExecQueryAsync(@"
CREATE OR REPLACE FUNCTION PUBLIC.AYGETNAME(IN AYOBJECTID BIGINT, IN AYATYPE INTEGER,TRANSLATIONID integer) RETURNS TEXT AS $BODY$ CREATE OR REPLACE FUNCTION PUBLIC.AYGETNAME(IN AYOBJECTID BIGINT, IN stype INTEGER,TRANSLATIONID integer) RETURNS TEXT AS $BODY$
DECLARE DECLARE
aytable TEXT DEFAULT ''; aytable TEXT DEFAULT '';
aynamecolumn TEXT DEFAULT 'name'; aynamecolumn TEXT DEFAULT 'name';
aytkey TEXT DEFAULT 'no'; aytkey TEXT DEFAULT 'no';
returnstr TEXT DEFAULT ''; returnstr TEXT DEFAULT '';
BEGIN BEGIN
case socktype case stype
when 0 then aytkey= 'NoType'; when 0 then aytkey= 'NoType';
when 1 then aytkey= 'Global'; when 1 then aytkey= 'Global';
when 2 then return 'FormUserOptions'; when 2 then return 'FormUserOptions';
@@ -666,14 +666,14 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
//UPDATED NAME FETCHER FOR INTEGRATION //UPDATED NAME FETCHER FOR INTEGRATION
await ExecQueryAsync(@" await ExecQueryAsync(@"
CREATE OR REPLACE FUNCTION PUBLIC.AYGETNAME(IN AYOBJECTID BIGINT, IN AYATYPE INTEGER,TRANSLATIONID integer) RETURNS TEXT AS $BODY$ CREATE OR REPLACE FUNCTION PUBLIC.AYGETNAME(IN AYOBJECTID BIGINT, IN stype INTEGER,TRANSLATIONID integer) RETURNS TEXT AS $BODY$
DECLARE DECLARE
aytable TEXT DEFAULT ''; aytable TEXT DEFAULT '';
aynamecolumn TEXT DEFAULT 'name'; aynamecolumn TEXT DEFAULT 'name';
aytkey TEXT DEFAULT 'no'; aytkey TEXT DEFAULT 'no';
returnstr TEXT DEFAULT ''; returnstr TEXT DEFAULT '';
BEGIN BEGIN
case socktype case stype
when 0 then aytkey= 'NoType'; when 0 then aytkey= 'NoType';
when 1 then aytkey= 'Global'; when 1 then aytkey= 'Global';
when 2 then return 'FormUserOptions'; when 2 then return 'FormUserOptions';