From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/GSurveys.page | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/pages/GSurveys.page b/force-app/main/default/pages/GSurveys.page
index dae81a4..887edec 100644
--- a/force-app/main/default/pages/GSurveys.page
+++ b/force-app/main/default/pages/GSurveys.page
@@ -1,9 +1,9 @@
-<apex:page standardController="Survey__c" extensions="GSurveysController" >
+<apex:page standardController="Survey__c" extensions="GSurveysController" lightningStylesheets="true">
<apex:stylesheet value="{!$Page.labs_survey_css}" />
<apex:includeScript value="{!URLFOR($Resource.SurveyForce, 'jquery.js')}"/>
-<script src="/soap/ajax/18.0/connection.js" type="text/javascript"></script>
-<script src="/soap/ajax/18.0/apex.js" type="text/javascript"></script>
+<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<script>sforce.connection.sessionId = '{!$Api.Session_ID}'; </script>
<script type="text/javascript">
function confirmDelete(deleteId){
@@ -69,14 +69,14 @@
<apex:repeat value="{!allSurveys}" var="sur" id="allSurveysRepeat">
<div class="survey_preview">
<h2><apex:outputLink value="/apex/SurveyManagerPage?id={!URLENCODE(sur.sId)}" >{!sur.sName}</apex:outputLink></h2>
- <div class="footer">
- <apex:form >
- <apex:commandLink value="{!$Label.LABS_SF_Delete}" action="{!doSurveyReset}" reRender="surveyList" onclick="confirmDelete('{!sur.sId}')">
- <apex:param assignTo="{!surveyDelete}" value="{!sur.sId}" name="d"/>
- </apex:commandLink>
- </apex:form>
- <apex:outputLink value="/apex/SurveyManagerPage?id={!URLENCODE(sur.sId)}" >{!$Label.LABS_SF_Edit}</apex:outputLink>
- </div>
+ <div class="footer">
+ <apex:form >
+ <apex:commandLink value="{!$Label.LABS_SF_Delete}" action="{!doSurveyReset}" reRender="surveyList" onclick="confirmDelete('{!sur.sId}')">
+ <apex:param assignTo="{!surveyDelete}" value="{!sur.sId}" name="d"/>
+ </apex:commandLink>
+ </apex:form>
+ <apex:outputLink value="/apex/SurveyManagerPage?id={!URLENCODE(sur.sId)}" >{!$Label.LABS_SF_Edit}</apex:outputLink>
+ </div>
</div>
</apex:repeat>
<br style="clear: both;" />
--
Gitblit v1.9.1