From 69790ecd5f89628336e2e6d7c11db756ed58e2f3 Mon Sep 17 00:00:00 2001
From: Fabian Braun <fsbraun@gmx.de>
Date: Mon, 5 Jun 2023 20:11:54 +0200
Subject: [PATCH 1/5] fix: id's localized

---
 .../delete_selected_files_confirmation.html   |  4 ++--
 .../filer/folder/choose_copy_destination.html | 19 +++----------------
 .../folder/choose_images_resize_options.html  |  4 ++--
 .../filer/folder/choose_move_destination.html |  7 +++----
 .../filer/folder/choose_rename_format.html    |  4 ++--
 .../admin/filer/folder/directory_listing.html |  2 +-
 .../filer/folder/directory_table_list.html    |  6 +++---
 .../folder/directory_thumbnail_list.html      |  6 +++---
 .../filer/tools/clipboard/clipboard.html      |  8 ++++----
 9 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/filer/templates/admin/filer/delete_selected_files_confirmation.html b/filer/templates/admin/filer/delete_selected_files_confirmation.html
index b56cdb5d0..bfbc4e4e0 100644
--- a/filer/templates/admin/filer/delete_selected_files_confirmation.html
+++ b/filer/templates/admin/filer/delete_selected_files_confirmation.html
@@ -32,10 +32,10 @@
             {% csrf_token %}
             <div>
                 {% for f in files_queryset %}
-                    <input type="hidden" name="{{ action_checkbox_name }}" value="file-{{ f.pk }}">
+                    <input type="hidden" name="{{ action_checkbox_name }}" value="file-{{ f.pk|safe }}">
                 {% endfor %}
                 {% for f in folders_queryset %}
-                    <input type="hidden" name="{{ action_checkbox_name }}" value="folder-{{ f.pk }}">
+                    <input type="hidden" name="{{ action_checkbox_name }}" value="folder-{{ f.pk|safe }}">
                 {% endfor %}
                 {% if is_popup %}
                     <input type="hidden" name="_popup" value="1">
diff --git a/filer/templates/admin/filer/folder/choose_copy_destination.html b/filer/templates/admin/filer/folder/choose_copy_destination.html
index ddaacfc93..1a479dbdd 100644
--- a/filer/templates/admin/filer/folder/choose_copy_destination.html
+++ b/filer/templates/admin/filer/folder/choose_copy_destination.html
@@ -13,22 +13,9 @@
 
 {% block extrahead %}
     {{ block.super }}
-    <script src="{% static 'filer/js/libs/jquery.min.js' %}"></script>
     <script src="{% static 'admin/js/jquery.init.js' %}"></script>
-    <script type="text/javascript">
-        var __jQuery = django.jQuery;
-        window.jQuery = (__jQuery) ? __jQuery : window.jQuery || undefined;
-        window.$ = window.jQuery;
-    </script>
     <script src="{% static 'filer/js/addons/tooltip.js' %}"></script>
     <script src="{% static 'filer/js/addons/copy-move-files.js' %}"></script>
-    <script type="text/javascript">
-        var __jQuery;
-        var __$;
-        // reassign jQuery if jQuery is already loaded
-        __jQuery = (window.jQuery) ? window.jQuery.noConflict(true) : undefined;
-        __$ = __jQuery;
-    </script>
 {% endblock %}
 
 {% block content %}
@@ -56,10 +43,10 @@
                     {% csrf_token %}
                     <div>
                         {% for f in files_queryset %}
-                            <input type="hidden" name="{{ action_checkbox_name }}" value="file-{{ f.pk }}">
+                            <input type="hidden" name="{{ action_checkbox_name }}" value="file-{{ f.pk|safe }}">
                         {% endfor %}
                         {% for f in folders_queryset %}
-                            <input type="hidden" name="{{ action_checkbox_name }}" value="folder-{{ f.pk }}">
+                            <input type="hidden" name="{{ action_checkbox_name }}" value="folder-{{ f.pk|safe }}">
                         {% endfor %}
                         <input type="hidden" name="action" value="copy_files_and_folders">
                         <input type="hidden" name="post" value="yes">
@@ -67,7 +54,7 @@
                             <label for="destination">{% blocktrans %}Destination folder:{% endblocktrans %}</label>
                             <select name="destination" id="destination">
                                 {% for folder, name_and_enabled in destination_folders %}
-                                    <option value="{{ folder.pk }}"{% if not name_and_enabled.1 %} disabled="disabled"{% endif %}{% if selected_destination_folder and folder.pk == selected_destination_folder %} selected="selected"{% endif %}>{{ name_and_enabled.0 }}</option>
+                                    <option value="{{ folder.pk|safe }}"{% if not name_and_enabled.1 %} disabled="disabled"{% endif %}{% if selected_destination_folder and folder.pk == selected_destination_folder %} selected="selected"{% endif %}>{{ name_and_enabled.0 }}</option>
                                 {% endfor %}
                             </select>
                         </p>
diff --git a/filer/templates/admin/filer/folder/choose_images_resize_options.html b/filer/templates/admin/filer/folder/choose_images_resize_options.html
index aa7395718..de4dad6dd 100644
--- a/filer/templates/admin/filer/folder/choose_images_resize_options.html
+++ b/filer/templates/admin/filer/folder/choose_images_resize_options.html
@@ -22,10 +22,10 @@
             <form action="" method="post">{% csrf_token %}
                 <div>
                     {% for f in files_queryset %}
-                        <input type="hidden" name="{{ action_checkbox_name }}" value="file-{{ f.pk }}">
+                        <input type="hidden" name="{{ action_checkbox_name }}" value="file-{{ f.pk|safe }}">
                     {% endfor %}
                     {% for f in folders_queryset %}
-                        <input type="hidden" name="{{ action_checkbox_name }}" value="folder-{{ f.pk }}">
+                        <input type="hidden" name="{{ action_checkbox_name }}" value="folder-{{ f.pk|safe }}">
                     {% endfor %}
                     <input type="hidden" name="action" value="resize_images">
                     <input type="hidden" name="post" value="yes">
diff --git a/filer/templates/admin/filer/folder/choose_move_destination.html b/filer/templates/admin/filer/folder/choose_move_destination.html
index c6e7fce96..5fada115f 100644
--- a/filer/templates/admin/filer/folder/choose_move_destination.html
+++ b/filer/templates/admin/filer/folder/choose_move_destination.html
@@ -13,7 +13,6 @@
 
 {% block extrahead %}
     {{ block.super }}
-    <script src="{% static 'filer/js/libs/jquery.min.js' %}"></script>
     <script src="{% static 'admin/js/jquery.init.js' %}"></script>
     <script type="text/javascript">
         var __jQuery = django.jQuery;
@@ -55,17 +54,17 @@
                 <form action="" method="post">{% csrf_token %}
                     <div>
                         {% for f in files_queryset %}
-                            <input type="hidden" name="{{ action_checkbox_name }}" value="file-{{ f.pk }}">
+                            <input type="hidden" name="{{ action_checkbox_name }}" value="file-{{ f.pk|safe }}">
                         {% endfor %}
                         {% for f in folders_queryset %}
-                            <input type="hidden" name="{{ action_checkbox_name }}" value="folder-{{ f.pk }}">
+                            <input type="hidden" name="{{ action_checkbox_name }}" value="folder-{{ f.pk|safe }}">
                         {% endfor %}
                         <input type="hidden" name="action" value="move_files_and_folders">
                         <input type="hidden" name="post" value="yes">
                         <p><label for="destination">{% blocktrans %}Destination folder:{% endblocktrans %}</label>
                         <select name="destination" id="destination">
                             {% for folder, name_and_enabled in destination_folders %}
-                                <option value="{{ folder.pk }}"{% if not name_and_enabled.1 %} disabled="disabled"{% endif %}>{{ name_and_enabled.0 }}</option>
+                                <option value="{{ folder.pk|safe }}"{% if not name_and_enabled.1 %} disabled="disabled"{% endif %}>{{ name_and_enabled.0 }}</option>
                             {% endfor %}
                         </select></p>
 
diff --git a/filer/templates/admin/filer/folder/choose_rename_format.html b/filer/templates/admin/filer/folder/choose_rename_format.html
index cbe2460f6..e17393d3b 100644
--- a/filer/templates/admin/filer/folder/choose_rename_format.html
+++ b/filer/templates/admin/filer/folder/choose_rename_format.html
@@ -23,10 +23,10 @@
                 {% csrf_token %}
                 <div>
                     {% for f in files_queryset %}
-                        <input type="hidden" name="{{ action_checkbox_name }}" value="file-{{ f.pk }}">
+                        <input type="hidden" name="{{ action_checkbox_name }}" value="file-{{ f.pk|safe }}">
                     {% endfor %}
                     {% for f in folders_queryset %}
-                        <input type="hidden" name="{{ action_checkbox_name }}" value="folder-{{ f.pk }}">
+                        <input type="hidden" name="{{ action_checkbox_name }}" value="folder-{{ f.pk|safe }}">
                     {% endfor %}
                     <input type="hidden" name="action" value="rename_files">
                     <input type="hidden" name="post" value="yes">
diff --git a/filer/templates/admin/filer/folder/directory_listing.html b/filer/templates/admin/filer/folder/directory_listing.html
index 9fdc122f5..789b3f887 100644
--- a/filer/templates/admin/filer/folder/directory_listing.html
+++ b/filer/templates/admin/filer/folder/directory_listing.html
@@ -199,7 +199,7 @@ <h2>&nbsp;</h2>
                         {% block object-tools-items %}
                             <div class="navigator-button-wrapper">
                                 {% if folder.can_have_subfolders and can_make_folder %}
-                                    <a href="{% url 'admin:filer-directory_listing-make_root_folder' %}?parent_id={{ folder.id }}{% if is_popup %}&amp;_popup=1{% endif %}"
+                                    <a href="{% url 'admin:filer-directory_listing-make_root_folder' %}?parent_id={{ folder.pk|safe }}{% if is_popup %}&amp;_popup=1{% endif %}"
                                         title="{% trans 'Adds a new Folder' %}"
                                         class="navigator-button"
                                         onclick="return showAddAnotherPopup(this);">
diff --git a/filer/templates/admin/filer/folder/directory_table_list.html b/filer/templates/admin/filer/folder/directory_table_list.html
index 406bbd0b1..a19a6c937 100644
--- a/filer/templates/admin/filer/folder/directory_table_list.html
+++ b/filer/templates/admin/filer/folder/directory_table_list.html
@@ -43,11 +43,11 @@
                             <td class="column-checkbox">
                                 {% if filer_admin_context.pick_folder and item.file_type == 'Folder' %}
                                     <a class="insertlink insertlinkButton"
-                                        href="#" onclick="opener.dismissRelatedFolderLookupPopup(window, {{ subfolder.id }}, '{{ subfolder.quoted_logical_path }}'); return false;" >
+                                        href="#" onclick="opener.dismissRelatedFolderLookupPopup(window, {{ subfolder.pk|safe }}, '{{ subfolder.quoted_logical_path }}'); return false;" >
                                         &nbsp;
                                     </a>
                                 {% elif action_form and item.pk and not is_popup %}
-                                    <input type="checkbox" class="action-select" value="folder-{{ item.pk }}" name="_selected_action">
+                                    <input type="checkbox" class="action-select" value="folder-{{ item.pk|safe }}" name="_selected_action">
                                 {% endif %}
                             </td>
                             <td class="column-icon">
@@ -92,7 +92,7 @@
                                     <a class="insertlink insertlinkButton" href="#" onclick="opener.dismissRelatedImageLookupPopup(window, {{ file.id|unlocalize }}, '{% file_icon_url file %}', '{{ file.label|escapejs }}'); return false;"
                                         title="{% trans 'Select this file' %}">&nbsp;</a>
                                 {% elif action_form and not is_popup %}
-                                    <input type="checkbox" class="action-select" value="file-{{ item.pk }}" name="_selected_action">
+                                    <input type="checkbox" class="action-select" value="file-{{ item.pk|safe }}" name="_selected_action">
                                 {% endif %}
                             </td>
                             <td class="column-icon">
diff --git a/filer/templates/admin/filer/folder/directory_thumbnail_list.html b/filer/templates/admin/filer/folder/directory_thumbnail_list.html
index e896c1a67..6ebde0510 100644
--- a/filer/templates/admin/filer/folder/directory_thumbnail_list.html
+++ b/filer/templates/admin/filer/folder/directory_thumbnail_list.html
@@ -39,11 +39,11 @@
                     <div class="navigator-checkbox">
                         {% if filer_admin_context.pick_folder and item.file_type == 'Folder' %}
                             <a class="insertlink insertlinkButton"
-                                href="#" onclick="opener.dismissRelatedFolderLookupPopup(window, {{ subfolder.id }}, '{{ subfolder.quoted_logical_path }}'); return false;" >
+                                href="#" onclick="opener.dismissRelatedFolderLookupPopup(window, {{ subfolder.pk|safe }}, '{{ subfolder.quoted_logical_path }}'); return false;" >
                                 &nbsp;
                             </a>
                         {% elif action_form and item.pk and not is_popup %}
-                            <input type="checkbox" class="action-select" value="folder-{{ item.pk }}" name="_selected_action">
+                            <input type="checkbox" class="action-select" value="folder-{{ item.pk|safe }}" name="_selected_action">
                         {% endif %}
                     </div>
                     <div class="item-icon">
@@ -85,7 +85,7 @@
                                       <a class="insertlink insertlinkButton" href="#" onclick="opener.dismissRelatedImageLookupPopup(window, {{ file.id|unlocalize }}, '{% file_icon_url file %}', '{{ file.label|escapejs }}'); return false;"
                                           title="{% trans 'Select this file' %}">&nbsp;</a>
                                   {% elif action_form and not is_popup %}
-                                      <input type="checkbox" class="action-select" value="file-{{ item.pk }}" name="_selected_action">
+                                      <input type="checkbox" class="action-select" value="file-{{ item.pk|safe }}" name="_selected_action">
                                   {% endif %}
                               </div>
                               <div class="thumbnail-file-item-box">
diff --git a/filer/templates/admin/filer/tools/clipboard/clipboard.html b/filer/templates/admin/filer/tools/clipboard/clipboard.html
index 0159b1c34..4dce738b1 100644
--- a/filer/templates/admin/filer/tools/clipboard/clipboard.html
+++ b/filer/templates/admin/filer/tools/clipboard/clipboard.html
@@ -14,21 +14,21 @@
                     <td colspan="3">
                         <form action="{% url 'admin:filer-paste_clipboard_to_folder' %}" method="post" style="display: inline;">
                             {% csrf_token %}
-                            <input type="hidden" name="folder_id" value="{{ folder.id }}">
-                            <input type="hidden" name="clipboard_id" value="{{ clipboard.id }}">
+                            <input type="hidden" name="folder_id" value="{{ folder.pk|safe }}">
+                            <input type="hidden" name="clipboard_id" value="{{ clipboard.pk|safe }}">
                             <input type="hidden" name="redirect_to" value="{{ current_url }}">
                             {% filer_admin_context_hidden_formfields %}
                             <button class="pastelink" type="submit" {% if folder.is_root or not permissions.has_add_children_permission %} disabled="disabled" style="color: gray;"{% endif %} title="{% trans 'Paste all items here' %}"><span>&lArr;</span>&nbsp;Paste</button>
                         </form>
                         <form action="{% url 'admin:filer-discard_clipboard' %}" method="post" style="display: inline;">{% csrf_token %}
-                            <input type="hidden" name="clipboard_id" value="{{ clipboard.id }}">
+                            <input type="hidden" name="clipboard_id" value="{{ clipboard.pk|safe }}">
                             <input type="hidden" name="redirect_to" value="{{ current_url }}">
                             {% filer_admin_context_hidden_formfields %}
                             <button class="deletelink" type="submit" title="{% trans 'Move all clipboard files to' %} &#39;{% trans 'Unsorted Uploads' %}&#39; {% trans 'folder' %}"><span>{% trans "Empty Clipboard" %}</span></button>
                         </form>
                         {% comment %}
                         <form action="{% url 'admin:filer-delete_clipboard' %}" method="post" style="display: inline;">{% csrf_token %}
-                            <input type="hidden" name="clipboard_id" value="{{ clipboard.id }}">
+                            <input type="hidden" name="clipboard_id" value="{{ clipboard.pk|safe }}">
                             <input type="hidden" name="redirect_to" value="{{ current_url }}">
                             {% if is_popup %}
                                 <input type="hidden" name="_popup" value="1">

From e4be3fd4b8e91d3ba36c567d72949996692f3b21 Mon Sep 17 00:00:00 2001
From: Fabian Braun <fsbraun@gmx.de>
Date: Mon, 5 Jun 2023 22:39:36 +0200
Subject: [PATCH 2/5] Update
 filer/templates/admin/filer/folder/directory_table_list.html

Co-authored-by: ivarsg <i.grinbergs@gmail.com>
---
 filer/templates/admin/filer/folder/directory_table_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filer/templates/admin/filer/folder/directory_table_list.html b/filer/templates/admin/filer/folder/directory_table_list.html
index a19a6c937..792ed0500 100644
--- a/filer/templates/admin/filer/folder/directory_table_list.html
+++ b/filer/templates/admin/filer/folder/directory_table_list.html
@@ -43,7 +43,7 @@
                             <td class="column-checkbox">
                                 {% if filer_admin_context.pick_folder and item.file_type == 'Folder' %}
                                     <a class="insertlink insertlinkButton"
-                                        href="#" onclick="opener.dismissRelatedFolderLookupPopup(window, {{ subfolder.pk|safe }}, '{{ subfolder.quoted_logical_path }}'); return false;" >
+                                        href="#" onclick="opener.dismissRelatedFolderLookupPopup(window, '{{ subfolder.pk|safe }}', '{{ subfolder.quoted_logical_path }}'); return false;" >
                                         &nbsp;
                                     </a>
                                 {% elif action_form and item.pk and not is_popup %}

From ba3e3a35a4c58d8fa89e4a558ad85a75db74e3ea Mon Sep 17 00:00:00 2001
From: Fabian Braun <fsbraun@gmx.de>
Date: Mon, 5 Jun 2023 22:39:46 +0200
Subject: [PATCH 3/5] Update
 filer/templates/admin/filer/folder/directory_table_list.html

Co-authored-by: ivarsg <i.grinbergs@gmail.com>
---
 filer/templates/admin/filer/folder/directory_table_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filer/templates/admin/filer/folder/directory_table_list.html b/filer/templates/admin/filer/folder/directory_table_list.html
index 792ed0500..b1b3656fb 100644
--- a/filer/templates/admin/filer/folder/directory_table_list.html
+++ b/filer/templates/admin/filer/folder/directory_table_list.html
@@ -89,7 +89,7 @@
                         <tr>
                             <td class="column-checkbox">
                                 {% if is_popup and filer_admin_context.pick_file %}
-                                    <a class="insertlink insertlinkButton" href="#" onclick="opener.dismissRelatedImageLookupPopup(window, {{ file.id|unlocalize }}, '{% file_icon_url file %}', '{{ file.label|escapejs }}'); return false;"
+                                    <a class="insertlink insertlinkButton" href="#" onclick="opener.dismissRelatedImageLookupPopup(window, '{{ file.id|unlocalize }}', '{% file_icon_url file %}', '{{ file.label|escapejs }}'); return false;"
                                         title="{% trans 'Select this file' %}">&nbsp;</a>
                                 {% elif action_form and not is_popup %}
                                     <input type="checkbox" class="action-select" value="file-{{ item.pk|safe }}" name="_selected_action">

From 4f04ffc4bde573c6a2ca5d1a7727d9cb0ab33ec0 Mon Sep 17 00:00:00 2001
From: Fabian Braun <fsbraun@gmx.de>
Date: Mon, 5 Jun 2023 22:40:02 +0200
Subject: [PATCH 4/5] Update
 filer/templates/admin/filer/folder/directory_thumbnail_list.html

Co-authored-by: ivarsg <i.grinbergs@gmail.com>
---
 .../templates/admin/filer/folder/directory_thumbnail_list.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filer/templates/admin/filer/folder/directory_thumbnail_list.html b/filer/templates/admin/filer/folder/directory_thumbnail_list.html
index 6ebde0510..fb84152b1 100644
--- a/filer/templates/admin/filer/folder/directory_thumbnail_list.html
+++ b/filer/templates/admin/filer/folder/directory_thumbnail_list.html
@@ -39,7 +39,7 @@
                     <div class="navigator-checkbox">
                         {% if filer_admin_context.pick_folder and item.file_type == 'Folder' %}
                             <a class="insertlink insertlinkButton"
-                                href="#" onclick="opener.dismissRelatedFolderLookupPopup(window, {{ subfolder.pk|safe }}, '{{ subfolder.quoted_logical_path }}'); return false;" >
+                                href="#" onclick="opener.dismissRelatedFolderLookupPopup(window, '{{ subfolder.pk|safe }}', '{{ subfolder.quoted_logical_path }}'); return false;" >
                                 &nbsp;
                             </a>
                         {% elif action_form and item.pk and not is_popup %}

From f15081d3e842cfadf5e6006628fc3505686cc109 Mon Sep 17 00:00:00 2001
From: Fabian Braun <fsbraun@gmx.de>
Date: Mon, 5 Jun 2023 22:40:13 +0200
Subject: [PATCH 5/5] Update
 filer/templates/admin/filer/folder/directory_thumbnail_list.html

Co-authored-by: ivarsg <i.grinbergs@gmail.com>
---
 .../templates/admin/filer/folder/directory_thumbnail_list.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filer/templates/admin/filer/folder/directory_thumbnail_list.html b/filer/templates/admin/filer/folder/directory_thumbnail_list.html
index fb84152b1..fb5b63c78 100644
--- a/filer/templates/admin/filer/folder/directory_thumbnail_list.html
+++ b/filer/templates/admin/filer/folder/directory_thumbnail_list.html
@@ -82,7 +82,7 @@
                           <div class="list-item thumbnail-item thumbnail-file-item">
                               <div class="navigator-checkbox">
                                   {% if is_popup and filer_admin_context.pick_file %}
-                                      <a class="insertlink insertlinkButton" href="#" onclick="opener.dismissRelatedImageLookupPopup(window, {{ file.id|unlocalize }}, '{% file_icon_url file %}', '{{ file.label|escapejs }}'); return false;"
+                                      <a class="insertlink insertlinkButton" href="#" onclick="opener.dismissRelatedImageLookupPopup(window, '{{ file.id|unlocalize }}', '{% file_icon_url file %}', '{{ file.label|escapejs }}'); return false;"
                                           title="{% trans 'Select this file' %}">&nbsp;</a>
                                   {% elif action_form and not is_popup %}
                                       <input type="checkbox" class="action-select" value="file-{{ item.pk|safe }}" name="_selected_action">