SAK-29537 : helpdeskUrl has no effect over the application

chundcm · Jun 29, 2015 · cc2cbc8 · cc2cbc8
1 parent faa451a
commit cc2cbc8
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 3 deletions.
diff --git a/feedback/src/java/org/sakaiproject/feedback/tool/FeedbackTool.java b/feedback/src/java/org/sakaiproject/feedback/tool/FeedbackTool.java
@@ -138,7 +138,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
         setStringAttribute(request, "featureSuggestionUrl", sakaiProxy.getConfigString("feedback.featureSuggestionUrl", ""));
         setStringAttribute(request, "helpPagesUrl", sakaiProxy.getConfigString("feedback.helpPagesUrl", "/portal/help/main"));
         setStringAttribute(request, "helpPagesTarget", sakaiProxy.getConfigString("feedback.helpPagesTarget", "_blank"));
-        setStringAttribute(request, "helpdeskUrl", sakaiProxy.getConfigString("feedback.helpdeskUrl", ""));
         setStringAttribute(request, "supplementaryInfo", sakaiProxy.getConfigString("feedback.supplementaryInfo", ""));
         request.setAttribute("maxAttachmentsMB", sakaiProxy.getAttachmentLimit());
         setStringAttribute(request, "technicalToAddress", sakaiProxy.getConfigString(Constants.PROP_TECHNICAL_ADDRESS, null));

diff --git a/feedback/src/webapp/WEB-INF/bootstrap.jsp b/feedback/src/webapp/WEB-INF/bootstrap.jsp
@@ -26,7 +26,6 @@
                 technicalToAddress: '${technicalToAddress}',
                 contactName: '${contactName}',
                 enableTechnical: ${enableTechnical},
-                helpdeskUrl: '${helpdeskUrl}',
                 helpPagesUrl: '${helpPagesUrl}',
                 helpPagesTarget: '${helpPagesTarget}',
                 supplementaryInfo: '${supplementaryInfo}',

diff --git a/feedback/src/webapp/js/feedback.js b/feedback/src/webapp/js/feedback.js
@@ -53,7 +53,6 @@
                                                     supplementaryInfo: feedback.supplementaryInfo,
                                                     helpPagesUrl: feedback.helpPagesUrl,
                                                     helpPagesTarget: feedback.helpPagesTarget,
-                                                    helpdeskUrl: feedback.helpdeskUrl,
                                                     loggedIn: loggedIn, showContentPanel : feedback.showContentPanel,
                                                     showHelpPanel : feedback.showHelpPanel,
                                                     showTechnicalPanel : feedback.showTechnicalPanel,