Merge pull request #1 from UW-Madison-DoIT/parameterize_earning_state…

…ment_url HRSPLT-137 : Move link to preference for payroll info
apetro · Mar 13, 2014 · 860b74e · 860b74e
2 parents 454fc0b + 5d103ff
commit 860b74e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/hrs-portlets-webapp/src/main/java/edu/wisc/portlet/hrs/web/HrsControllerBase.java b/hrs-portlets-webapp/src/main/java/edu/wisc/portlet/hrs/web/HrsControllerBase.java
@@ -41,7 +41,7 @@ public class HrsControllerBase {
     protected final Logger logger = LoggerFactory.getLogger(getClass());
 
     private String notificationPreferences = "notification";
-    private String helpUrlPreferences = "helpUrl";
+    protected static final String helpUrlPreferences = "helpUrl";
     private HrsUrlDao hrsUrlDao;
 
 
@@ -60,7 +60,7 @@ public void setHrsUrlDao(HrsUrlDao hrsUrlDao) {
     @ModelAttribute("helpUrl")
     public final String getNavLinks(PortletRequest request) {
         final PortletPreferences preferences = request.getPreferences();
-        return preferences.getValue(this.helpUrlPreferences, "#");
+        return preferences.getValue(helpUrlPreferences, "#");
     }
 
     /**

diff --git a/...s-webapp/src/main/java/edu/wisc/portlet/hrs/web/payroll/PayrollInformationController.java b/...s-webapp/src/main/java/edu/wisc/portlet/hrs/web/payroll/PayrollInformationController.java
@@ -19,16 +19,20 @@
 
 package edu.wisc.portlet.hrs.web.payroll;
 
+import javax.portlet.PortletPreferences;
 import javax.portlet.PortletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import edu.wisc.hr.dao.person.ContactInfoDao;
 import edu.wisc.hr.dm.person.PersonInformation;
+
 import org.jasig.springframework.security.portlet.authentication.PrimaryAttributeUtils;
+
 import edu.wisc.portlet.hrs.web.HrsControllerBase;
 
 /**
@@ -44,6 +48,17 @@ public class PayrollInformationController extends HrsControllerBase {
     public void setContactInfoDao(ContactInfoDao contactInfoDao) {
         this.contactInfoDao = contactInfoDao;
     }
+
+    /**
+     * Gets the URL to a page describing your earning statement
+     * @param request the request
+     * @return the value of the portlet preference
+     */
+    @ModelAttribute("understandingEarningUrl")
+    public final String getUnderstandingEarningUrl(PortletRequest request) {
+        final PortletPreferences preferences = request.getPreferences();
+        return preferences.getValue("understandingEarningUrl",null);
+    }
 
     @RequestMapping
     public String viewContactInfo(ModelMap model, PortletRequest request) {

diff --git a/hrs-portlets-webapp/src/main/webapp/WEB-INF/jsp/payrollInformation.jsp b/hrs-portlets-webapp/src/main/webapp/WEB-INF/jsp/payrollInformation.jsp
@@ -68,9 +68,11 @@
         </div>
         <hrs:pagerNavBar position="bottom" />
       </div>
-      <div class="dl-link">
-        <a href="https://uwservice.wisc.edu/hrs/earnings-statement.php" target="_blank">Understanding Your Earnings Statement</a>
-      </div>
+      <c:if test="${not empty understandingEarningUrl}">
+          <div class="dl-link">
+            <a href="${understandingEarningUrl}" target="_blank">Understanding Your Earnings Statement</a>
+          </div>
+      </c:if>
     </div>
     <div id="${n}dl-tax-statements" class="dl-tax-statements ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide">
       <div class="tax-description">