From 6749937d4efa8d07712b00e34824fba36a065a5c Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 28 Feb 2011 09:31:56 -0800
Subject: [PATCH] No direct appending of URL's, since it breaks Prevent Proxy
 Cache.  Also, i18n the buttons.  Fixes bug #12051.

---
 docs/changelog/7.x.x.txt           |  1 +
 lib/WebGUI/Asset/Wobject/Thingy.pm | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 8d127a23d..4806b8e67 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.10.11
  - fixed #12057: WebGUI::Search, assetIds search clause
+ - fixed #12051: Prevent Proxy Caching Breaks Edit/Add Thing
 
 7.10.10
  - fixed #12035: Story Manager - make keywords from Story view work
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index 5b468d59b..f8111e258 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -1903,11 +1903,12 @@ sub www_editThing {
             ."\n<table>\n<tr>\n"
             ."  <td style='width:100px;' valign='top' class='formDescription'>".$field->{label}."</td>\n"
             ."  <td style='width:370px;'>".$formElement."</td>\n"
-            ."  <td style='width:120px;' valign='top'> <input onClick=\"editListItem('".$self->session->url->page()
-            ."?func=editField;fieldId=".$field->{fieldId}.";thingId=".$thingId."','".$field->{fieldId}."')\" value='Edit' type='button'>"
-            ." <input onClick=\"editListItem('".$self->session->url->page()
-            ."?func=editField;copy=1;fieldId=".$field->{fieldId}.";thingId=".$thingId."','".$field->{fieldId}
-            ."','copy')\" value='Copy' type='button'>"
+            ."  <td style='width:120px;' valign='top'> <input onClick=\"editListItem('"
+            .$self->getUrl('func=editField;fieldId='.$field->{fieldId}.';thingId='.$thingId)
+            ."','".$field->{fieldId}."')\" value='".$i18n->get('Edit','Icon')."' type='button'>"
+            ." <input onClick=\"editListItem('"
+            .$self->getUrl('func=editField;copy=1;fieldId='.$field->{fieldId}.';thingId='.$thingId)
+            ."','".$field->{fieldId}."','copy')\" value='".$i18n->get('Copy','Icon')."' type='button'>"
             ."<input onClick=\"deleteListItem('".$self->session->url->page()."','".$field->{fieldId}."','".$thingId."')\" " 
             ."value='".$i18n->get('Delete','Icon')."' type='button'></td>\n</tr>\n</table>\n</li>\n";
 
@@ -2349,8 +2350,9 @@ sub www_editFieldSave {
 
     $listItemHTML = "<table>\n<tr>\n<td style='width:100px;' valign='top' class='formDescription'>".$label."</td>\n"
         ."<td style='width:370px;'>".$formElement."</td>\n"
-        ."<td style='width:120px;' valign='top'> <input onClick=\"editListItem('".$session->url->page()
-        ."?func=editField;fieldId=".$newFieldId.";thingId=".$properties{thingId}."','".$newFieldId."')\" value='".$i18n->get('Edit','Icon')."' type='button'>"
+        ."<td style='width:120px;' valign='top'> <input onClick=\"editListItem('"
+        .$self->getUrl('func=editField;fieldId='.$newFieldId.';thingId='.$properties{thingId})
+        ."','".$newFieldId."')\" value='".$i18n->get('Edit','Icon')."' type='button'>"
         ."<input onClick=\"deleteListItem('".$session->url->page()."','".$newFieldId
         ."','".$properties{thingId}."')\" value='".$i18n->get('Delete','Icon')."' type='button'></td>\n</tr>\n</table>";