Skip to content

Commit a450248

Browse files
author
Tina Kung
committed
Fixed the issue where Save button is conflicting with Ajax action status of the charge calculator
1 parent 85822fc commit a450248

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

CustomProductSelector/src/pages/CustomProductSelector.page

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@
1313
rendered="{!editMode}">
1414
<zqu:zChargeGroup editMode="{!editMode}"
1515
chargeGroup="{!currentChargeGroup}">
16-
<apex:actionStatus id="saveStatus">
16+
<apex:actionStatus id="calculatingStatus">
1717
<apex:facet name="start">
18-
<apex:commandButton value="Saving ..." disabled="true" />
18+
<apex:commandButton value="Updating ..." disabled="true" />
1919
</apex:facet>
2020
<apex:facet name="stop">
2121
<apex:commandButton value="Save" action="{!saveChargeGroup}"
22-
reRender="quoting_page_block, pageErrors" status="saveStatus" />
22+
reRender="quoting_page_block, pageErrors"
23+
status="calculatingStatus" />
2324
</apex:facet>
2425
</apex:actionStatus>
26+
2527
<apex:actionStatus id="cancelStatus">
2628
<apex:facet name="start">
2729
<apex:commandButton value="Canceling ..." disabled="true" />
@@ -91,15 +93,15 @@
9193
<apex:commandButton value="Querying ..." disabled="true" />
9294
</apex:facet>
9395
<apex:facet name="stop">
94-
<apex:outputPanel >
95-
<apex:commandButton value="Select New Products"
96-
action="{!toSelectNewProductsView}"
97-
reRender="quoting_page_block, pageErrors"
98-
rendered="{!! (editMode||selectNewProductViewMode) }"
99-
status="selectNewProductStatus" />
100-
<apex:commandButton value="Done" action="{!navigateBack}"
101-
status="selectNewProductStatus" />
102-
</apex:outputPanel>
96+
<apex:outputPanel>
97+
<apex:commandButton value="Select New Products"
98+
action="{!toSelectNewProductsView}"
99+
reRender="quoting_page_block, pageErrors"
100+
rendered="{!! (editMode||selectNewProductViewMode) }"
101+
status="selectNewProductStatus" />
102+
<apex:commandButton value="Done" action="{!navigateBack}"
103+
status="selectNewProductStatus" />
104+
</apex:outputPanel>
103105
</apex:facet>
104106
</apex:actionStatus>
105107
</apex:pageBlockSection>

0 commit comments

Comments
 (0)