From 51fb56f3f5b0dc96d7f93a71f9b61263e303243f Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期二, 10 五月 2022 15:12:45 +0800
Subject: [PATCH] Fix Edit Record Without AWSId
---
force-app/main/default/pages/NewAndEditTenderinformation.page | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditTenderinformation.page b/force-app/main/default/pages/NewAndEditTenderinformation.page
index 93ba3e9..f067b1a 100644
--- a/force-app/main/default/pages/NewAndEditTenderinformation.page
+++ b/force-app/main/default/pages/NewAndEditTenderinformation.page
@@ -1,6 +1,6 @@
<apex:page standardController="Tender_information__c" extensions="NewAndEditTenderinformationController" id="page">
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
- <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
@@ -122,7 +122,7 @@
updateMethod:"NewAndEditTenderinformationController.saveTenderinformation",
insertMethod:"NewAndEditTenderinformationController.saveTenderinformation"
}
- AWSService.sfSessionId = '{!GETSESSIONID()}';
+ AWSService.sfSessionId = '{!GETSESSIONID()}';
var staticResources = JSON.parse('{!staticResource}');
var requiredFieldAPIList = JSON.parse('{!requiredFieldAPIListStr}');
var fieldAPIToLabelMap = JSON.parse('{!fieldAPIToLabelMapStr}');
@@ -131,7 +131,7 @@
function ProcessPI(sobjJson, payloadForNewPI) {
blockme();
if ({!isNewMode} || {!isCloneMode}) {
- NewPIToAWS(sobjJson, payloadForNewPI)
+ NewPIToAWS(sobjJson, payloadForNewPI)
}else {
UpdatePIToAWS(sobjJson, payloadForNewPI)
}
@@ -171,8 +171,8 @@
}
return ['input','select','textarea'].indexOf(tag_name.toLowerCase())>-1;
}
-
- function IsFormElement(e){
+
+ function IsFormElement(e){
return IsFormTag(e.tagName);
}
@@ -254,7 +254,7 @@
}
//targets = targets.replace(/\n/g, ";");
if (targets !=''){
- result[field_api_name] = targets.join(";");
+ result[field_api_name] = targets.join(";");
}
} else {
result[field_api_name] = ele.value;
@@ -321,7 +321,9 @@
function checkRequiredFieldMsg(formData) {
let blankRequiredFields = '';
for(i = 0;i<requiredFieldAPIList.length;i++){
- if(formData[requiredFieldAPIList[i]]){
+ if(formData[requiredFieldAPIList[i]] && (VLookUpFields.indexOf(requiredFieldAPIList[i]) == -1)){
+ continue;
+ }else if((VLookUpFields.indexOf(requiredFieldAPIList[i]) != -1) && formData[requiredFieldAPIList[i]] != '000000000000000'){
continue;
}else{
if(blankRequiredFields == ''){
--
Gitblit v1.9.1