From c1d79c36c08dc52e90dfaaa8ea77000518b0858d Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Mon, 25 Feb 2019 23:02:10 +0100
Subject: [PATCH] net/haproxy: make rules sortable, closes #582

---
 .../app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml | 1 +
 .../controllers/OPNsense/HAProxy/forms/dialogFrontend.xml    | 2 ++
 .../src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml | 5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
index e00da8571..d5c98e31a 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
@@ -316,6 +316,7 @@
         <label>Select Rules</label>
         <type>select_multiple</type>
         <style>tokenize</style>
+        <sortable>true</sortable>
         <help><![CDATA[Choose rules to be included in this Backend Pool.]]></help>
         <hint>Choose rules.</hint>
     </field>
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml
index c6ec4ebaf..04ee8183e 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml
@@ -95,6 +95,7 @@
         <type>select_multiple</type>
         <style>tokenize</style>
         <allownew>true</allownew>
+        <sortable>true</sortable>
         <help><![CDATA[Used to enforce or disable certain SSL options.]]></help>
     </field>
     <field>
@@ -401,6 +402,7 @@
         <label>Select Rules</label>
         <type>select_multiple</type>
         <style>tokenize</style>
+        <sortable>true</sortable>
         <help><![CDATA[Choose rules to be included in this Public Service.]]></help>
         <hint>Choose rules.</hint>
     </field>
diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
index cbb44ae18..7f000b9bb 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
@@ -1,6 +1,6 @@
 <model>
     <mount>//OPNsense/HAProxy</mount>
-    <version>2.6.0</version>
+    <version>2.7.0</version>
     <description>the HAProxy load balancer</description>
     <items>
         <general>
@@ -398,6 +398,7 @@
                 <ssl_bindOptions type="OptionField">
                     <Required>N</Required>
                     <default>no-sslv3,no-tlsv10,no-tls-tickets</default>
+                    <Sorted>Y</Sorted>
                     <Multiple>Y</Multiple>
                     <OptionValues>
                         <no-sslv3>no-sslv3</no-sslv3>
@@ -667,6 +668,7 @@
                         </template>
                     </Model>
                     <ValidationMessage>Related action item not found</ValidationMessage>
+                    <Sorted>Y</Sorted>
                     <multiple>Y</multiple>
                     <Required>N</Required>
                 </linkedActions>
@@ -983,6 +985,7 @@
                         </template>
                     </Model>
                     <ValidationMessage>Related action item not found</ValidationMessage>
+                    <Sorted>Y</Sorted>
                     <multiple>Y</multiple>
                     <Required>N</Required>
                 </linkedActions>