[jboss-svn-commits] JBL Code SVN: r19359 - in labs/jbosslabs/labs-3.0-build/views/admin/src/main: webapp/license and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: wrzep
Date: 2008-04-01 05:31:40 -0400 (Tue, 01 Apr 2008)
New Revision: 19359

Modified:
   labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/UpdateLicense.java
   labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/license.xhtml
Log:
JBLAB-915 edit license - save/apply

Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/UpdateLicense.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/UpdateLicense.java	2008-04-01 07:50:26 UTC (rev 19358)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/UpdateLicense.java	2008-04-01 09:31:40 UTC (rev 19359)
@@ -57,7 +57,15 @@
     private static final long serialVersionUID = -8691237645254515225L;
 
     public String save(License license) throws NamingException {
+         return save(license, false);
+    }
 
+    public String apply(License license) throws NamingException {
+         return save(license, true);
+    }
+
+    public String save(License license, boolean apply) throws NamingException {
+
         for (License l : licenses) {
             if (l.getName().equals(license.getName()) &&
                     (l.getLicenseVersion().equals(license.getLicenseVersion()))
@@ -76,11 +84,17 @@
 
         this.license = licenseService.updateLicense(license);
 
-        conversation.end();
-
         facesMessages.add("License has been updated successfully.");
 
-        return Pages.LICENSES_PAGE;
+        if (!apply) {
+
+            conversation.end();
+
+            return Pages.LICENSES_PAGE;
+            
+        } else {
+            return "";
+        }
     }
 
 //    @End

Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/license.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/license.xhtml	2008-04-01 07:50:26 UTC (rev 19358)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/license.xhtml	2008-04-01 09:31:40 UTC (rev 19359)
@@ -60,9 +60,7 @@
             </ui:remove>
             <br/>
             <h:commandButton value="Save" action="#{updateLicense.save(license)}"/>
-            <ui:remove>
-                <h:commandButton value="Apply" action="#{updateLicense.apply(license)}" />
-            </ui:remove>
+            <h:commandButton value="Apply" action="#{updateLicense.apply(license)}" />
             <s:button value="Cancel" action="/license/licenses.seam">
                 <s:conversationPropagation type="end"/>
             </s:button>