Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 82577 invoked from network); 7 Dec 2009 19:28:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Dec 2009 19:28:18 -0000 Received: (qmail 52105 invoked by uid 500); 7 Dec 2009 19:28:17 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 52071 invoked by uid 500); 7 Dec 2009 19:28:17 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 52061 invoked by uid 99); 7 Dec 2009 19:28:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Dec 2009 19:28:17 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Dec 2009 19:28:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6D67523888DD; Mon, 7 Dec 2009 19:27:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: jetspeed-dev@portals.apache.org From: woonsan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091207192755.6D67523888DD@eris.apache.org> 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("#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); --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org