You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2013/08/07 11:27:16 UTC
git commit: Fixed the account management page loading error.
Updated Branches:
refs/heads/master 439fb5588 -> 0eba94f87
Fixed the account management page loading error.
Note : This issue caused due to the billing component not in apache stratos. Without billing component "Usage Plan" functionality didn't work. To fix this issue I have remove this functionality. To revert it again please uncomment comments in folling files.
components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/UsagePlanClient.java
components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/account_mgt.jsp
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/0eba94f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0eba94f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0eba94f8
Branch: refs/heads/master
Commit: 0eba94f8763ea77e88f46255f48fe5d8dc181547
Parents: 439fb55
Author: Manula Thantriwatte <ma...@wso2.com>
Authored: Wed Aug 7 14:49:21 2013 +0530
Committer: Manula Thantriwatte <ma...@wso2.com>
Committed: Wed Aug 7 14:49:21 2013 +0530
----------------------------------------------------------------------
.../account/mgt/ui/clients/UsagePlanClient.java | 15 +++++++++------
.../main/resources/web/account-mgt/account_mgt.jsp | 7 +++++--
2 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0eba94f8/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/UsagePlanClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/UsagePlanClient.java b/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/UsagePlanClient.java
index 69ed628..758da2f 100644
--- a/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/UsagePlanClient.java
+++ b/components/org.apache.stratos.account.mgt.ui/src/main/java/org/apache/stratos/account/mgt/ui/clients/UsagePlanClient.java
@@ -73,14 +73,17 @@ public class UsagePlanClient {
}
public String getUsagePlanName(String tenantDomain) throws Exception{
- Subscription subscription;
+ //Subscription subscription;
try {
- subscription=stub.getActiveSubscriptionOfCustomerByTenant();
- if(subscription!=null){
- return subscription.getSubscriptionPlan();
- } else {
+ // This section get commented because billing component is removed. In account_mgt jsp file get usage plan functionality removed.
+ // If rewrite that functionality please uncomment below code lines.
+
+ //subscription=stub.getActiveSubscriptionOfCustomerByTenant();
+ //if(subscription!=null){
+ // return subscription.getSubscriptionPlan();
+ //} else {
return "";
- }
+ //}
} catch (Exception e) {
String msg = "Error occurred while getting the usage plan for tenant: " + tenantDomain;
log.error(msg, e);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0eba94f8/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/account_mgt.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/account_mgt.jsp b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/account_mgt.jsp
index f2eade4..46aa789 100644
--- a/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/account_mgt.jsp
+++ b/components/org.apache.stratos.account.mgt.ui/src/main/resources/web/account-mgt/account_mgt.jsp
@@ -400,7 +400,8 @@ under the License.
</tbody>
</table>
-
+<!-- This section get commented because billling component is removed. So this fuctionality didn't work -->
+<!--
<table class="styledLeft">
<thead>
<tr>
@@ -441,7 +442,7 @@ function updatePlan(plan, existingPlan, regTenantDomain) {
}
</script>
- <tr>
+ <tr>
<td class="nopadding">
<form method="POST" id="usagePlanUpdate_form"
<% if (chargeOnRegistration){ %>
@@ -484,6 +485,7 @@ function updatePlan(plan, existingPlan, regTenantDomain) {
</div>
</div>
</fmt:bundle>
+
<script type="text/javascript">
jQuery(document).ready(
@@ -525,3 +527,4 @@ function updatePlan(plan, existingPlan, regTenantDomain) {
}
);
</script>
+ -->