From 1f0c54bfc3bfa1f9d777e194ca60f755c7c1948b Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia-webagency.com>
Date: Wed, 24 Jun 2020 15:17:50 +0400
Subject: [PATCH] PHRAS-3148 :Fix  drag and drop terms

---
 templates/web/thesaurus/accept.html.twig      | 33 ++++++++++---------
 .../web/thesaurus/import-dialog.html.twig     | 13 ++++----
 templates/web/thesaurus/properties.html.twig  |  1 +
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/templates/web/thesaurus/accept.html.twig b/templates/web/thesaurus/accept.html.twig
index 3f25e80e35..962284af95 100644
--- a/templates/web/thesaurus/accept.html.twig
+++ b/templates/web/thesaurus/accept.html.twig
@@ -30,17 +30,18 @@
             function ok()
             {
                 as = "";
-                if((n=document.forms[0].as.length) > 0)
+                if($(".as_1").length > 0)
                 {
-                    for(i=0; i<n && as==""; i++)
-                    {
-                        if(document.forms[0].as[i].checked)
-                            as = document.forms[0].as[i].value;
-                    }
+                        if($(".as_1")[0].checked) {
+                            as = $(".as_1").val();
+                        }
+                        if($(".as_2")[0].checked) {
+                            as = $(".as_2").val();
+                        }
                 }
                 else
                 {
-                    as = document.forms[0].as.value;
+                    as = $(".as_2").val();
                 }
                 if(as == "TS")
                 {
@@ -59,14 +60,14 @@
                         switch(refresh.item(i).getAttribute("type"))
                         {
                             case "CT":
-                                {{ opener }}.reloadCtermsBranch(refresh.item(i).getAttribute("id"));
+                                reloadCtermsBranch(refresh.item(i).getAttribute("id"));
                             break;
                         case "TH":
-                                {{ opener }}.reloadThesaurusBranch(refresh.item(i).getAttribute("id"));
+                                reloadThesaurusBranch(refresh.item(i).getAttribute("id"));
                             break;
                         }
                     }
-                    self.close();
+                    $('.close-dialog').trigger('click');
                 }
                 else if(as == "SY")
                 {
@@ -85,14 +86,14 @@
                         switch(refresh.item(i).getAttribute("type"))
                         {
                             case "CT":
-                                {{ opener }}.reloadCtermsBranch(refresh.item(i).getAttribute("id"));
+                                reloadCtermsBranch(refresh.item(i).getAttribute("id"));
                                 break;
                             case "TH":
-                                {{ opener }}.reloadThesaurusBranch(refresh.item(i).getAttribute("id"));
+                                reloadThesaurusBranch(refresh.item(i).getAttribute("id"));
                                 break;
                             }
                         }
-                        self.close();
+                    $('.close-dialog').trigger('click');
                     }
                 }
         </script>
@@ -144,9 +145,9 @@
                         {{ 'thesaurus:: Accepter le terme comme' | trans }}
                         <br/><br/><h4>{{ fullpath_src | raw }}</h4><br/><br/>
                         <br/>
-                        <input type='radio' name='as' value='TS' checked>{{ 'thesaurus:: comme terme specifique' | trans }}
+                        <input type='radio' name='as' class="as_1" value='TS' checked>{{ 'thesaurus:: comme terme specifique' | trans }}
                         <br/><br/>
-                        <input type='radio' name='as' value='SY'>
+                        <input type='radio' name='as' class="as_2" value='SY'>
                         {% set fullpath_tgt_raw = fullpath_tgt | raw %}
                         {% trans with {'%fullpath_tgt_raw%' : fullpath_tgt_raw} %}thesaurus:: comme synonyme de %fullpath_tgt_raw%{% endtrans %}
                         <br/>
@@ -155,7 +156,7 @@
                         {{ 'thesaurus:: Accepter la branche comme' | trans }}
                         &nbsp;{{ 'thesaurus:: comme terme specifique' | trans }}
                         <br/><br/><h4>{{ fullpath_tgt | raw }}</h4><br/><br/>
-                        <input type='hidden' name='as' value='TS'>
+                        <input type='hidden' name='as' class="as_1" value='TS'>
                     {% endif %}
                             <br/>
                             <br/>
diff --git a/templates/web/thesaurus/import-dialog.html.twig b/templates/web/thesaurus/import-dialog.html.twig
index 2696b04ede..563b4de8ef 100644
--- a/templates/web/thesaurus/import-dialog.html.twig
+++ b/templates/web/thesaurus/import-dialog.html.twig
@@ -15,13 +15,12 @@
             {
                 switch(button)
                 {
-                    case "submit":
-                        document.forms[0].target='IFRIM';
-                        document.forms[0].submit();
+                    case "submit":=
+                        $('.import-form').submit();
                         break;
                     case "cancel":
                             self.returnValue = null;
-                        self.close();
+                        $('.close-dialog').trigger('click');
                         break;
                 }
             }
@@ -32,8 +31,8 @@
             {
                 if(!err)
                 {
-                    {{ opener }}.reload();
-                    self.close();
+                    reload();
+                    $('.close-dialog').trigger('click');
                 }
                 else
                 {
@@ -44,7 +43,7 @@
     </head>
     <body onload="loaded();" class="dialog">
         <br/>
-        <form onsubmit="clkBut('submit');return(false);" action="import.php" enctype="multipart/form-data" method="post">
+        <form onsubmit="clkBut('submit');return(false);" action="import.php" enctype="multipart/form-data" method="post" class="import-form" target="IFRIM">
             <input type="hidden" name="bid" value="{{ bid }}" >
             <input type="hidden" name="piv" value="{{ piv }}" >
             <input type="hidden" name="id" value="{{ id }}" >
diff --git a/templates/web/thesaurus/properties.html.twig b/templates/web/thesaurus/properties.html.twig
index 43e1c05b91..a772deaebb 100644
--- a/templates/web/thesaurus/properties.html.twig
+++ b/templates/web/thesaurus/properties.html.twig
@@ -139,6 +139,7 @@
             parms += "&newlng=" + encodeURIComponent(lng);
 
             ret = loadXMLDoc(url, parms, true);
+            alert(ret);
             sy_list = ret.getElementsByTagName("sy_list").item(0);
 
             refresh_sy(sy_list);