Merge pull request #493 from Maheshgopal/OLE-8725_8716

OLE-8716 toggle issue in loan
openlibraryenvironment · Mar 4, 2016 · 71661f0 · 71661f0
2 parents 2a8e609 + acaab57
commit 71661f0
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 16 deletions.
diff --git a/ole-app/olefs/src/main/java/org/kuali/ole/deliver/controller/OLEPlaceRequestController.java b/ole-app/olefs/src/main/java/org/kuali/ole/deliver/controller/OLEPlaceRequestController.java
diff --git a/ole-app/olefs/src/main/java/org/kuali/ole/deliver/form/OLEPlaceRequestForm.java b/ole-app/olefs/src/main/java/org/kuali/ole/deliver/form/OLEPlaceRequestForm.java
@@ -68,7 +68,7 @@ public class OLEPlaceRequestForm extends UifFormBase {
     private String existingAddressType;
     private boolean displayRequestType=false;
     private boolean addressUpdated;
-
+    private boolean showOk=false;
     private String requestNote;
 
     private String pickUpLocation;
@@ -505,4 +505,12 @@ public String getRequestNote() {
     public void setRequestNote(String requestNote) {
         this.requestNote = requestNote;
     }
+
+    public boolean isShowOk() {
+        return showOk;
+    }
+
+    public void setShowOk(boolean showOk) {
+        this.showOk = showOk;
+    }
 }
diff --git a/ole-app/olefs/src/main/resources/org/kuali/ole/deliver/view/OLEPlaceRequestView.xml b/ole-app/olefs/src/main/resources/org/kuali/ole/deliver/view/OLEPlaceRequestView.xml
@@ -96,8 +96,9 @@
     <bean id="OLEOverrideButtons" parent="Uif-HorizontalBoxSection">
         <property name="items">
             <list>
-                <bean id="OLEPlaceRequestOverrideButton" parent="Uif-SecondaryActionButton-Small" p:methodToCall="overrideRequest" p:actionLabel="Override" p:successCallback="cancelOverride();" p:render="@{!blockOverride}"/>
-                <bean id="OLEPlaceRequestCancelButton" parent="Uif-SecondaryActionButton-Small" p:actionScript="cancelOverride();" p:actionLabel="cancel"/>
+                <bean id="OLEPlaceRequestOverrideButton" parent="Uif-SecondaryActionButton-Small" p:methodToCall="overrideRequest" p:actionLabel="Override" p:successCallback="cancelOverride();" p:render="@{!blockOverride and !showOk}"/>
+                <bean id="OLEPlaceRequestCancelButton" parent="Uif-SecondaryActionButton-Small" p:actionScript="cancelOverride();" p:actionLabel="cancel" p:render="@{!showOk}"/>
+                <bean id="OLEPlaceRequestOkButton" parent="Uif-SecondaryActionButton-Small"  p:render="@{showOk}" p:actionLabel="ok" p:actionScript="cancelOverride();"/>
             </list>
         </property>
     </bean>

diff --git a/...ain/resources/org/kuali/ole/deliver/view/circulations/sections/item/current-loan-list.xml b/...ain/resources/org/kuali/ole/deliver/view/circulations/sections/item/current-loan-list.xml
@@ -22,7 +22,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
-    <bean id="currentLoanListSection-HorizontalBoxSection" p:onClickScript="toggleCurrentLoanSection()" parent="Uif-HorizontalBoxSection" p:style="width:1300px;margin-left:auto; margin-right:0;" p:render="@{loanDocumentListForCurrentSession.size() > 0}">
+    <bean id="currentLoanListSection-HorizontalBoxSection" parent="Uif-HorizontalBoxSection" p:style="width:1300px;margin-left:auto; margin-right:0;" p:render="@{loanDocumentListForCurrentSession.size() > 0}">
         <property name="headerText" value="&lt;a&gt;Items Checked Out This Session&lt;/a&gt;"/>
         <property name="items">
             <list>

diff --git a/ole-app/olefs/src/main/webapp/WEB-INF/ftl/existing-loan-list.ftl b/ole-app/olefs/src/main/webapp/WEB-INF/ftl/existing-loan-list.ftl
@@ -25,7 +25,7 @@
             <th>Pending Requests</th>
             <th>Send Notices</th>
         </thead>
-        <tbody  onclick="toggleExistingLoanSection()" >
+        <tbody>
             <#list manager.searchLines as line>
             <tr class="odd">
                 <td><@existing_loan_checkbox_control line 'checkNo' container "" /></td>

diff --git a/ole-app/olefs/src/main/webapp/ole/deliver/loan/script/circ.js b/ole-app/olefs/src/main/webapp/ole/deliver/loan/script/circ.js
@@ -3,17 +3,9 @@ function openLightboxOnLoad(dialogId) {
     jQuery('.uif-dialogButtons').button();
 }
 
-function toggleCurrentLoanSection(){
-    jq( "#currentLoanListSection-HorizontalBoxSection" ).click(function() {
-        jq( "#currentLoanList-HorizontalBoxSection" ).toggle();
-    });
-}
 
-function toggleExistingLoanSection(){
-    jq( "#existingLoanItemListSection-HorizontalBoxSection" ).click(function() {
-        jq( "#existingLoanItemList-HorizontalBoxSection" ).toggle();
-    });
-}
+
+
 
 function openLightboxOnLoadWithOverrideParameters(dialogId,overrideParameters) {
     showLightboxComponent(dialogId, overrideParameters);
@@ -163,6 +155,18 @@ jq(document).ready(function () {
             }
         }
     });
+
+
+        jq( "#existingLoanItemListSection-HorizontalBoxSection h3").live("click",function() {
+            jq( "#existingLoanItemList-HorizontalBoxSection" ).toggle();
+
+        });
+
+         jq( "#currentLoanListSection-HorizontalBoxSection h3" ).live("click",function() {
+            jq( "#currentLoanList-HorizontalBoxSection" ).toggle();
+        });
+
+
 });
 
 function setTimeoutInterval(interval){