[gatein-commits] gatein SVN: r2550 - in portal/trunk: gadgets/server/src/main/webapp/WEB-INF/classes/containers/default and 2 other directories.

Author: kien_nguyen Date: 2010-04-09 06:00:34 -0400 (Fri, 09 Apr 2010) New Revision: 2550 Modified: portal/trunk/gadgets/core/src/main/java/containers/default/container.js portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java Log: GTNPORTAL-1014 : Returned currentView does not match enum view Modified: portal/trunk/gadgets/core/src/main/java/containers/default/container.js =================================================================== --- portal/trunk/gadgets/core/src/main/java/containers/default/container.js 2010-04-09 09:44:03 UTC (rev 2549) +++ portal/trunk/gadgets/core/src/main/java/containers/default/container.js 2010-04-09 10:00:34 UTC (rev 2550) @@ -114,12 +114,12 @@ "jsonProxyUrl" : "http://%host%/eXoGadgetServer/gadgets/makeRequest" }, "views" : { - "home" : { + "HOME" : { "isOnlyVisible" : false, "urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/home?{var}", "aliases": ["DASHBOARD", "default"] }, - "canvas" : { + "HOME" : { "isOnlyVisible" : true, "urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/canvas?{var}", "aliases" : ["FULL_PAGE"] Modified: portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js =================================================================== --- portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js 2010-04-09 09:44:03 UTC (rev 2549) +++ portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js 2010-04-09 10:00:34 UTC (rev 2550) @@ -114,12 +114,12 @@ "jsonProxyUrl" : "http://%host%/eXoGadgetServer/gadgets/makeRequest" }, "views" : { - "home" : { + "HOME" : { "isOnlyVisible" : false, "urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/home?{var}", "aliases": ["DASHBOARD", "default"] }, - "canvas" : { + "CANVAS" : { "isOnlyVisible" : true, "urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/canvas?{var}", "aliases" : ["FULL_PAGE"] Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2010-04-09 09:44:03 UTC (rev 2549) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2010-04-09 10:00:34 UTC (rev 2550) @@ -276,10 +276,10 @@ */ gadgets.IfrGadgetService.prototype.getUrlForView = function( view) { - if (view === 'canvas') { - return 'canvas'; - } else if (view === 'home') { - return 'home'; + if (view === 'CANVAS') { + return 'CANVAS'; + } else if (view === 'HOME') { + return 'HOME'; } else { return null; } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2010-04-09 09:44:03 UTC (rev 2549) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2010-04-09 10:00:34 UTC (rev 2550) @@ -86,9 +86,9 @@ public static final String PREF_DEBUG = "_pref_debug_"; - public static final String HOME_VIEW = "home"; + public static final String HOME_VIEW = "HOME"; - public static final String CANVAS_VIEW = "canvas"; + public static final String CANVAS_VIEW = "HOME"; public String view = HOME_VIEW;