[portal-commits] JBoss Portal SVN: r9029 - in branches/JBoss_Portal_Branch_2_6/core-wsrp/src: resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers and 1 other directory.

[portal-commits at lists.jboss.org]

Author: chris.laprun at jboss.com
Date: 2007-11-19 18:57:36 -0500 (Mon, 19 Nov 2007)
New Revision: 9029

Modified:
   branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
   branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
   branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
Log:
- JBPORTAL-1566: Use commandButton instead of commandLink for default action.

Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java	2007-11-19 23:54:15 UTC (rev 9028)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java	2007-11-19 23:57:36 UTC (rev 9029)
@@ -318,7 +318,7 @@
             }
          }
 
-         return manager.refreshConsumer();
+         return manager.refresh(consumer);
       }
 
       beanContext.createErrorMessage("Couldn't save Consumer!");

Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java	2007-11-19 23:54:15 UTC (rev 9028)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java	2007-11-19 23:57:36 UTC (rev 9029)
@@ -255,6 +255,14 @@
       }
    }
 
+   String refresh(WSRPConsumer consumer)
+   {
+      internalRefresh(consumer);
+      selectedId = consumer.getProducerId();
+      setConsumerIdInSession(false);
+      return CONFIGURE_CONSUMER;
+   }
+
    public String listConsumers()
    {
       setConsumerIdInSession(true);

Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml	2007-11-19 23:54:15 UTC (rev 9028)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml	2007-11-19 23:57:36 UTC (rev 9029)
@@ -139,11 +139,9 @@
 </c:if>
 <tr>
    <td colspan="2" style="padding: 1em 1em 1em 0;">
-      <h:commandLink action="#{consumer.refreshConsumer}" value="Refresh &amp; Save"
-                     title="Save changes and refresh information from Producer"
-                     styleClass="portlet-form-button">
-         <f:param name="id" value="#{consumer.id}"/>
-      </h:commandLink>
+      <h:commandButton action="#{consumer.refreshConsumer}" value="Refresh &amp; Save"
+                       title="Save changes and refresh information from Producer"
+                       styleClass="portlet-form-button"/>
       <h:commandLink action="#{consumersMgr.listConsumers}" value="Cancel" immediate="true"
                      styleClass="portlet-form-button"/>
    </td>