Index: trunk/admin/include/tabs.js =================================================================== diff -u -r259 -r268 --- trunk/admin/include/tabs.js (.../tabs.js) (revision 259) +++ trunk/admin/include/tabs.js (.../tabs.js) (revision 268) @@ -136,17 +136,15 @@ //Used to submit the form when a tab is clicked on function edit_submit(formname, status_field, targetURL, save_value, env_str, new_target) { - var full_env = env; - if( HasParam(env_str) ) full_env += env_str; + var full_env = env; + if( HasParam(env_str) ) full_env += env_str; - if(full_env.substr(0,3)!="env") - full_env = 'env='+full_env; - - f = document.getElementById(formname); + if(full_env.substr(0,3) != "env") full_env = 'env=' + full_env; + f = document.getElementById(formname); - if(f) - { - var valid = false; + if(f) + { + var valid = false; if(save_value != 2 && save_value !=-1) { valid = DataIsValid(f); @@ -161,23 +159,23 @@ } if(valid || save_value==2 || save_value==-1) { - f.action = rootURL + targetURL + '?' + full_env; - if(status_field.length>0) - { - f.elements[status_field].value = save_value; //0= stay in temp, 1=save to perm, 2 = purge no save - } - alert('action: '+f.action); - if(new_target != null && typeof(new_target) != 'undefined') f.target = new_target; + var URLPrefix = ''; + if( targetURL.substring(0, rootURL.length) != rootURL ) URLPrefix = rootURL; + + f.action = URLPrefix + targetURL + '?' + full_env; + if(status_field.length > 0) + { + f.elements[status_field].value = save_value; //0= stay in temp, 1=save to perm, 2 = purge no save + } - f.submit(); + if(new_target != null && typeof(new_target) != 'undefined') f.target = new_target; + f.submit(); } else - if(!valid) - alert(ErrorMsg); - - } - else - alert('Form '+formname+' was not found.'); + if(!valid) alert(ErrorMsg); + } + else + alert('Form '+formname+' was not found.'); } //Used when the save or cancel buttin is hit