Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 989661092F for ; Fri, 2 Aug 2013 15:41:54 +0000 (UTC) Received: (qmail 44238 invoked by uid 500); 2 Aug 2013 15:41:54 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 43755 invoked by uid 500); 2 Aug 2013 15:41:49 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 43717 invoked by uid 99); 2 Aug 2013 15:41:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Aug 2013 15:41:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Fri, 02 Aug 2013 15:41:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1B05223888E7; Fri, 2 Aug 2013 15:41:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1509747 - /struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl Date: Fri, 02 Aug 2013 15:41:27 -0000 To: commits@struts.apache.org From: bphillips@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130802154127.1B05223888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bphillips Date: Fri Aug 2 15:41:26 2013 New Revision: 1509747 URL: http://svn.apache.org/r1509747 Log: WW-4153 added Freemarker markup to handle use case when multiple="true" attribute is included with s:select tag but no name or id attribute is provided. Modified: struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl Modified: struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl?rev=1509747&r1=1509746&r2=1509747&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl Fri Aug 2 15:41:26 2013 @@ -118,8 +118,21 @@ <#include "/${parameters.templateDir}/simple/optgroup.ftl" /> + <#if parameters.multiple?default(false)> - + <#if (parameters.id?? && parameters.name??)> + + + <#if (parameters.id?? && !parameters.name??)> + + + <#if ( !parameters.id?? && parameters.name??)> + + + <#if ( !parameters.id?? && !parameters.name??)> + + + <#if parameters.disabled?default(false)> disabled="disabled"<#rt/>