portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r888099 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
Date Mon, 07 Dec 2009 19:27:51 GMT
Author: woonsan
Date: Mon Dec  7 19:27:49 2009
New Revision: 888099

URL: http://svn.apache.org/viewvc?rev=888099&view=rev
Log:
JS2-1057: changes on json handling caused by jetspeed json provider change.

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=888099&r1=888098&r2=888099&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
Mon Dec  7 19:27:49 2009
@@ -223,12 +223,8 @@
         
         var templatePanel = Y.Node.one("#<portlet:namespace/>portletItemTemplate");
         var defs = [];
-        if (dataOut.definitions.definition) {
-            if (dataOut.definitions.definition instanceof Array) {
-                defs = dataOut.definitions.definition;
-            } else {
-                defs.push(dataOut.definitions.definition);
-            }
+        if (dataOut.collection) {
+            defs = dataOut.collection;
         }
         for (var i = 0; i < defs.length; i++) {
             var def = defs[i];
@@ -242,14 +238,7 @@
             }
             
             var nameNode = clone.one('div');
-
-            if (def.displayNames.displayName) {
-                if (def.displayNames.displayName instanceof Array) {
-                    nameNode.setContent(def.displayNames.displayName[0].value);
-                } else {
-                    nameNode.setContent(def.displayNames.displayName.value);
-                }
-            }
+            nameNode.setContent(def.displayNames[0].value);
 
             <c:choose>
 	            <c:when test="${editAccess}">



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message