From: mh <mh>
Date: Mon, 23 Dec 2002 03:50:47 +0000 (+0000)
Subject: add in query_.. parameters to the delete request url so that we come back to the... 
X-Git-Tag: BEFORE_MERGE_1_1~361
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=a0a6ee63f4280c048b960e5d03752607d721097b;p=mir.git

add in query_.. parameters to the delete request url so that we come back to the same place on the list when deleting a media item. also: it's data.query_media_folder not query_media_folder.
---

diff --git a/templates/admin/audiolist.template b/templates/admin/audiolist.template
index 960b6ad4..22322c6d 100755
--- 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 bc874aa4..b3d306c1 100755
--- 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 05718b70..fa2a3c2e 100755
--- 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 38ca8a05..1e066bb7 100755
--- 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>