From 533b236fdbfb0df3a3b1ea459e88e69f1c3b3ec7 Mon Sep 17 00:00:00 2001
From: Aleksandr Mashchenko <amashchenko@apache.org>
Date: Thu, 2 Feb 2017 21:56:53 +0200
Subject: [PATCH] WW-4739 <s:reset> tag does not properly interpret the
 attribute tabindex

---
 core/src/main/resources/template/simple/reset.ftl           | 6 ++++++
 .../java/org/apache/struts2/views/jsp/ui/ResetTest.java     | 2 ++
 .../resources/org/apache/struts2/views/jsp/ui/Reset-1.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Reset-3.txt   | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/src/main/resources/template/simple/reset.ftl b/core/src/main/resources/template/simple/reset.ftl
index 7e7481f86..67d6505e4 100644
--- a/core/src/main/resources/template/simple/reset.ftl
+++ b/core/src/main/resources/template/simple/reset.ftl
@@ -37,6 +37,9 @@
 <#if parameters.disabled!false>
  disabled="disabled"<#rt/>
 </#if>
+<#if parameters.tabindex?has_content>
+ tabindex="${parameters.tabindex?html}"<#rt/>
+</#if>
 <#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl"/>
 <#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
 <#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
@@ -69,6 +72,9 @@
 <#if parameters.disabled!false>
  disabled="disabled"<#rt/>
 </#if>
+<#if parameters.tabindex?has_content>
+ tabindex="${parameters.tabindex?html}"<#rt/>
+</#if>
 <#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" />
 <#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
 <#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java
index 913ead808..6db4adf10 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java
@@ -59,6 +59,7 @@ public class ResetTest extends AbstractUITagTest {
         tag.setLabel("mylabel");
         tag.setName("myname");
         tag.setValue("%{foo}");
+        tag.setTabindex("1");
 
         tag.doStartTag();
         tag.doEndTag();
@@ -75,6 +76,7 @@ public class ResetTest extends AbstractUITagTest {
         tag.setType("button");
         tag.setName("myname");
         tag.setValue("%{foo}");
+        tag.setTabindex("1");
 
         tag.doStartTag();
         tag.doEndTag();
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt
index 699faf701..4d6b7fc77 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><input type="reset" name="myname" value="bar"/></div></td>
+    <td colspan="2"><div class="formButton"><input type="reset" name="myname" value="bar" tabindex="1"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt
index a9f63c05f..f956573fd 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><button type="reset" name="myname" value="bar">bar</button></div></td>
+    <td colspan="2"><div class="formButton"><button type="reset" name="myname" value="bar" tabindex="1">bar</button></div></td>
 </tr>