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:16 UTC
[struts] branch master updated (60e1212 -> 79e1b22)
This is an automated email from the ASF dual-hosted git repository.
yasserzamani pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.
from 60e1212 Merge pull request #522 from apache/WW-4792-constants-cleanup
add 3d39fba WW-5117 Restores previous behavior where tag was before action on stack
add 893a892 WW-5117 Evaluates dynamic attributes when assigning them to tag Reverts https://github.com/apache/struts/pull/447/commits/8bbe1949e17d58e1b5aef9c71e1279ad12ad7ba7#diff-0a39f082871f48bd14037ab2e3a3911b0b1046506c1d93338024d77d412a7075L305-L309
add a4a4e9e WW-5117 Does a conditional evaluation depending on the tag Some tags requires to perform a lazy evaluation which can only happen in ftl template as performing it in the component class is not possible
add b0e18e9 WW-5117 Uses translateVariables instead of findString to allow join expressions
add 9c05422 WW-5117 Adjusts expression checking
add 41e7292 WW-5117 Uses attribute translations in tests
add 7ed77f5 WW-5117 Adds a new attribute to test the new behaviour
new 79e1b22 Merge pull request #525 from apache/WW-5117-evaluate-dynamic-attributes-cherrypick
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
[struts] 01/01: Merge pull request #525 from apache/WW-5117-evaluate-dynamic-attributes-cherrypick
Posted by ya...@apache.org.
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(-)