[jboss-svn-commits] JBL Code SVN: r19681 - 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-22 04:41:32 -0400 (Tue, 22 Apr 2008)
New Revision: 19681

Modified:
   labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/DeleteLicense.java
   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, done, fixed conversations issue

Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/DeleteLicense.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/DeleteLicense.java	2008-04-22 08:18:49 UTC (rev 19680)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/DeleteLicense.java	2008-04-22 08:41:32 UTC (rev 19681)
@@ -73,8 +73,6 @@
 
         facesMessages.add("License '" + license.toLicenseString() + "' has been deleted.");
 
-        conversation.end();
-
-        return Pages.HOME_PAGE;
+        return Pages.LICENSES_PAGE;
     }
 }
\ No newline at end of file

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-22 08:18:49 UTC (rev 19680)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/UpdateLicense.java	2008-04-22 08:41:32 UTC (rev 19681)
@@ -46,7 +46,7 @@
 @Guice
 public class UpdateLicense implements Serializable {
 
-    @In private Conversation conversation;
+   // @In private Conversation conversation;
 
     @Out(scope = ScopeType.CONVERSATION, required = false) private License license;
 

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-22 08:18:49 UTC (rev 19680)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/license.xhtml	2008-04-22 08:41:32 UTC (rev 19681)
@@ -61,9 +61,7 @@
             <br/>
             <h:commandButton value="Save" action="#{updateLicense.save(license)}"/>
             <h:commandButton value="Apply" action="#{updateLicense.apply(license)}" />
-            <s:button value="Cancel" action="/license/licenses.seam">
-                <s:conversationPropagation type="end"/>
-            </s:button>
+            <s:button value="Cancel" action="/license/licenses.seam"/>
         </s:validateAll>
     </h:form>
 </ui:define>