From 22263191ed230b2a9abe804c24cac6a6f90e1c3b Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 28 Oct 2008 19:31:00 +0000
Subject: [PATCH] merging: 8188

---
 docs/changelog/7.x.x.txt                      |  1 +
 .../build/assetManager/assetManager.js        | 22 ++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 2d8492d2d..ba2a7d074 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -155,6 +155,7 @@
  - fixed: debian licensing problem with user list
  - fixed: Wrong password behaviour  (#8905)
  - fixed: Duplicate Root URLs Allowed  (#8900)
+ - fixed: Edit branch not working with noCache  (#4154)
  - removed the old js file IndexedSearch/ColorPicker2.js that hasn't been used
    in about 3 years. 
  - Fixed #8984: Weather Asset missing hoverhelp
diff --git a/www/extras/yui-webgui/build/assetManager/assetManager.js b/www/extras/yui-webgui/build/assetManager/assetManager.js
index 2dd9a6aef..029f39444 100644
--- a/www/extras/yui-webgui/build/assetManager/assetManager.js
+++ b/www/extras/yui-webgui/build/assetManager/assetManager.js
@@ -15,6 +15,18 @@ if ( typeof WebGUI.AssetManager == "undefined" ) {
 WebGUI.AssetManager.extrasUrl   = '/extras/';
 // Keep track of the open more menus
 WebGUI.AssetManager.MoreMenusDisplayed = {};
+// Append something to a url:
+WebGUI.AssetManager.appendToUrl = function ( url, params ) {
+    var components = [ url ];
+    if (url.match(/\?/)) {
+        components.push(";");
+    }
+    else {
+        components.push("?");
+    }
+    components.push(params);
+    return components.join(''); 
+}
 
 /*---------------------------------------------------------------------------
     WebGUI.AssetManager.addHighlightToRow ( child )
@@ -50,7 +62,7 @@ WebGUI.AssetManager.findRow
 */
 WebGUI.AssetManager.formatActions = function ( elCell, oRecord, oColumn, orderNumber ) {
     elCell.innerHTML 
-        = '<a href="' + oRecord.getData( 'url' ) + '?func=edit;proceed=manageAssets">Edit</a>'
+        = '<a href="' + WebGUI.AssetManager.appendToUrl(oRecord.getData( 'url' ), 'func=edit;proceed=manageAssets') + '">Edit</a>'
         + ' | '
         ;
     var more    = document.createElement( 'a' );
@@ -69,7 +81,7 @@ WebGUI.AssetManager.formatActions = function ( elCell, oRecord, oColumn, orderNu
     var menuItems   = [];
     for ( var i = 0; i < rawItems.length; i++ ) {
         var itemUrl     = rawItems[i].url.match( /<url>/ )
-                        ? rawItems[i].url.replace( "<url>", oRecord.getData( 'url' ) )
+                        ? rawItems[i].url.replace( /<url>(?:\?(.*))?/, WebGUI.AssetManager.appendToUrl(oRecord.getData( 'url' ), "$1") )
                         : oRecord.getData( 'url' ) + rawItems[i].url
                         ;
         menuItems.push( { "url" : itemUrl, "text" : rawItems[i].label } );
@@ -122,11 +134,11 @@ WebGUI.AssetManager.formatLockedBy = function ( elCell, oRecord, oColumn, orderN
     var extras  = WebGUI.AssetManager.extrasUrl;
     elCell.innerHTML 
         = oRecord.getData( 'lockedBy' )
-        ? '<a href="' + oRecord.getData( 'url' ) + '?func=manageRevisions">'
+        ? '<a href="' + WebGUI.AssetManager.appendToUrl(oRecord.getData( 'url' ), 'func=manageRevisions') + '">'
             + '<img src="' + extras + '/assetManager/locked.gif" alt="locked by ' + oRecord.getData( 'lockedBy' ) + '" '
             + 'title="locked by ' + oRecord.getData( 'lockedBy' ) + '" border="0" />'
             + '</a>'
-        : '<a href="' + oRecord.getData( 'url' ) + '?func=manageRevisions">'
+        : '<a href="' + WebGUI.AssetManager.appendToUrl(oRecord.getData( 'url' ), 'func=manageRevisions') + '">'
             + '<img src="' + extras + '/assetManager/unlocked.gif" alt="unlocked" '
             + 'title="unlocked" border="0" />'
             + '</a>'
@@ -187,7 +199,7 @@ WebGUI.AssetManager.formatRevisionDate = function ( elCell, oRecord, oColumn, or
 WebGUI.AssetManager.formatTitle = function ( elCell, oRecord, oColumn, orderNumber ) {
     elCell.innerHTML = '<span class="hasChildren">' 
         + ( oRecord.getData( 'childCount' ) > 0 ? "+" : "&nbsp;" )
-        + '</span> <a href="' + oRecord.getData( 'url' ) + '?op=assetManager;method=manage">'
+        + '</span> <a href="' + WebGUI.AssetManager.appendToUrl(oRecord.getData( 'url' ), 'op=assetManager;method=manage') + '">'
         + oRecord.getData( 'title' )
         + '</a>'
         ;