You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@struts.apache.org by ya...@apache.org on 2022/01/18 06:34:17 UTC

[struts] 01/01: Merge pull request #525 from apache/WW-5117-evaluate-dynamic-attributes-cherrypick

This is an automated email from the ASF dual-hosted git repository.

yasserzamani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 79e1b22cc6404d6a33c917248b68a4bdc28fb99f
Merge: 60e1212 7ed77f5
Author: Yasser Zamani <ya...@apache.org>
AuthorDate: Tue Jan 18 10:04:11 2022 +0330

    Merge pull request #525 from apache/WW-5117-evaluate-dynamic-attributes-cherrypick
    
    [WW-5117] Evaluates dynamic attributes - cherrypick

 .../apache/struts2/components/CheckboxList.java    | 16 +++++++++++---
 .../org/apache/struts2/components/ListUIBean.java  |  1 -
 .../java/org/apache/struts2/components/Radio.java  | 17 ++++++++++++---
 .../java/org/apache/struts2/components/UIBean.java | 25 +++++++++++++++++++---
 .../template/FreemarkerTemplateEngine.java         |  9 +++-----
 .../resources/template/simple/checkboxlist.ftl     |  8 +++----
 .../template/simple/dynamic-attributes.ftl         |  6 +++++-
 .../main/resources/template/simple/radiomap.ftl    |  5 +++--
 .../apache/struts2/views/jsp/ui/TextfieldTest.java |  2 ++
 .../apache/struts2/views/jsp/ui/Textfield-5.txt    |  2 +-
 10 files changed, 67 insertions(+), 24 deletions(-)