Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FISH-374 Remove Support Portal Integration from Admin Console #5045

Merged
merged 2 commits into from
Dec 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@
setPageSessionAttribute(key="appPropertyEndpoint" value="#{sessionScope.REST_URL}/system-applications/application/__admingui/property.json")
gf.restRequest(endpoint="#{pageSession.appPropertyEndpoint}" method="GET" result="#{requestScope.propList}");
setPageSessionAttribute(key="appPropList" value="#{requestScope.propList.data.extraProperties.properties}");

gf.restRequest(endpoint="#{sessionScope.REST_URL}/configs/config/server-config/zendesk-support-configuration/get-zendesk-support-configuration" method="GET" result="#{requestScope.zenresp}");
if (#{requestScope.zenresp.data.extraProperties.zendeskSupportConfiguration['enabled']}){
setPageSessionAttribute(key="zendeskenabled", value="true");
}
/>
</event>
<sun:form id="propertyForm">
Expand All @@ -81,9 +76,6 @@
//will be null if checkbox is unchecked.
setPageSessionAttribute(key="loadOnStartup" value="false");
}
if(!#{pageSession.zendeskenabled}){
setPageSessionAttribute(key="zendeskenabled" value="false");
}
setAttribute(key="found" value="false");
if('! #{pageSession.loadOnStartup}=#{pageSession.origLoadOnStartup}'){
foreach (var="oneProp" list="#{pageSession.appPropList}") {
Expand All @@ -101,10 +93,6 @@
javaToJSON(obj="#{pageSession.appPropList}" json="#{requestScope.tmpJSON}");
gf.restRequest(endpoint="#{pageSession.appPropertyEndpoint}", method="POST", data="#{requestScope.tmpJSON}");
}
createMap(result="#{pageSession.zenMap}")
mapPut(map="#{pageSession.zenMap}" key="enabled" value="#{pageSession.zendeskenabled}");
gf.updateEntity(endpoint="#{sessionScope.REST_URL}/configs/config/server-config/zendesk-support-configuration/set-zendesk-support-configuration"
attrs="#{pageSession.zenMap}");
prepareSuccessfulMsg();
gf.redirect(page="#{pageSession.selfPage}&alertType=${alertType}&alertSummary=${alertSummary}&alertDetail=${alertDetail}");
/>
Expand All @@ -131,10 +119,6 @@
}
/>
</sun:checkbox>
</sun:property>
<sun:property id="supportEnabled" labelAlign="left" noWrap="#{false}" overlapLabel="#{false}"
label="$resource{i18nc.domain.supportEnabled}" helpText="$resource{i18nc.domain.supportEnabledHelp}">
<sun:checkbox id="supportEnabled" label="$resource{i18n.common.Enabled}" selected="#{pageSession.zendeskenabled}" selectedValue="true" />
</sun:property>
<sun:property id="dummy" >
<sun:staticText id="dummy" text=" " />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ masthead.Home=Home
masthead.Version=About...
masthead.Help=Help
masthead.OnlineHelp=Online Help
masthead.EnterpriseLink=Payara Enterprise
masthead.enableAsadminRecorder=Enable Asadmin Recorder
masthead.disableAsadminRecorder=Disable Asadmin Recorder

Expand All @@ -177,6 +178,7 @@ helpWindowIndex=Index
homeLinkTooltip=Return to Application Home Page
versionTooltip=Display Product Version. (Opens a new window)
helpWindowTooltip=Help in a new window
enterpriseLinkTooltip=Visit the online Payara Enterprise description page
onlineHelpWindowTooltip=Payara online help docs in a new window
enableAsadminRecorderToolTip=Enable recording of Asadmin Commands
disableAsadminRecorderToolTip=Disable recording of Asadmin Commands
Expand Down
128 changes: 0 additions & 128 deletions appserver/admingui/payara-support/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading