add in query_.. parameters to the delete request url so that we come back to the...

diff --git a/templates/admin/audiolist.template b/templates/admin/audiolist.template
index 960b6ad..22322c6 100755 (executable)
--- a/templates/admin/audiolist.template
+++ b/templates/admin/audiolist.template
@@ -42,7 +42,7 @@
        <td>
        <select name="query_media_folder">
        <list extra.mediafolderPopupData as m>
-       <option value="${m.key}" <if m.key == query_media_folder>selected</if>>${m.value}</option>
+       <option value="${m.key}" <if m.key == data.query_media_folder>selected</if>>${m.value}</option>
        </list>
        </select>
        </td>
@@ -84,7 +84,7 @@
   <td><span class="text">&nbsp;
        <if data.cid><a href="${config.actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${data.cid}">${lang("attach")}</a>
        <else>
-       <a href="${config.actionRoot}?module=Audio&do=delete&id=${entry.id}">${lang("delete")}</a>
+       <a href="${config.actionRoot}?module=Audio&do=delete&id=${entry.id}&query_text=${utility.encodeHTML(data.query_text_encoded)}&query_field=${utility.encodeHTML(data.query_field)}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.offset}">${lang("delete")}</a>
     | <a href="${config.actionRoot}?module=Audio&do=edit&id=${entry.id}">${lang("edit")}</a>
        </if>
        </span></td>

diff --git a/templates/admin/imagelist.template b/templates/admin/imagelist.template
index bc874aa..b3d306c 100755 (executable)
--- a/templates/admin/imagelist.template
+++ b/templates/admin/imagelist.template
@@ -42,7 +42,7 @@
        <td>
        <select name="query_media_folder">
        <list extra.mediafolderPopupData as m>
-       <option value="${m.key}" <if m.key == query_media_folder>selected</if>>${m.value}</option>
+       <option value="${m.key}" <if m.key == data.query_media_folder>selected</if>>${m.value}</option>
        </list>
        </select>
        </td>
@@ -86,7 +86,7 @@
   <td><span class="text">&nbsp;
        <if data.cid><a href="${config.actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${data.cid}">${lang("attach")}</a>
        <else>
-       <a href="${config.actionRoot}?module=Images&do=delete&id=${entry.id}">${lang("delete")}</a>
+       <a href="${config.actionRoot}?module=Images&do=delete&id=${entry.id}&query_text=${utility.encodeHTML(data.query_text_encoded)}&query_field=${utility.encodeHTML(data.query_field)}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.offset}">${lang("delete")}</a>
     | <a href="${config.actionRoot}?module=Images&do=edit&id=${entry.id}">${lang("edit")}</a>
        </if>
        </span></td>

diff --git a/templates/admin/medialist.template b/templates/admin/medialist.template
index 05718b7..fa2a3c2 100755 (executable)
--- a/templates/admin/medialist.template
+++ b/templates/admin/medialist.template
@@ -42,7 +42,7 @@
        <td>
        <select name="query_media_folder">
        <list extra.mediafolderPopupData as m>
-       <option value="${m.key}" <if m.key == query_media_folder>selected</if>>${m.value}</option>
+       <option value="${m.key}" <if m.key == data.query_media_folder>selected</if>>${m.value}</option>
        </list>
        </select>
        </td>
@@ -84,7 +84,7 @@
   <td><span class="text">&nbsp;
        <if data.cid><a href="${config.actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${data.cid}">${lang("attach")}</a>
        <else>
-       <a href="${config.actionRoot}?module=OtherMedia&do=delete&id=${entry.id}">${lang("delete")}</a>
+       <a href="${config.actionRoot}?module=OtherMedia&do=delete&id=${entry.id}&query_text=${utility.encodeHTML(data.query_text_encoded)}&query_field=${utility.encodeHTML(data.query_field)}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.offset}">${lang("delete")}</a>
     | <a href="${config.actionRoot}?module=OtherMedia&do=edit&id=${entry.id}">${lang("edit")}</a>
        </if>
        </span></td>

diff --git a/templates/admin/videolist.template b/templates/admin/videolist.template
index 38ca8a0..1e066bb 100755 (executable)
--- a/templates/admin/videolist.template
+++ b/templates/admin/videolist.template
@@ -42,7 +42,7 @@
        <td>
        <select name="query_media_folder">
        <list extra.mediafolderPopupData as m>
-       <option value="${m.key}" <if m.key == query_media_folder>selected</if>>${m.value}</option>
+       <option value="${m.key}" <if m.key == data.query_media_folder>selected</if>>${m.value}</option>
        </list>
        </select>
        </td>
@@ -84,7 +84,7 @@
   <td><span class="text">&nbsp;
        <if data.cid><a href="${config.actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${data.cid}">${lang("attach")}</a>
        <else>
-       <a href="${config.actionRoot}?module=Video&do=delete&id=${entry.id}">${lang("delete")}</a>
+       <a href="${config.actionRoot}?module=Video&do=delete&id=${entry.id}&query_text=${utility.encodeHTML(data.query_text_encoded)}&query_field=${utility.encodeHTML(data.query_field)}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.offset}">${lang("delete")}</a>
     | <a href="${config.actionRoot}?module=Video&do=edit&id=${entry.id}">${lang("edit")}</a>
        </if>
        </span></td>