cvs commit: jahia/core/src/webapp/jsp/jahia/engines/shared embedded_flat_filemanager.jsp

[Cedric Mailleux]

cmailleux    2005/10/06 15:31:45 CEST

  Modified files:
    core/src/webapp/jsp/jahia/engines/shared 
                                             embedded_flat_filemanager.jsp 
  Log:
  Test if '?' is already present before changing form action
  
  Revision  Changes    Path
  1.19      +12 -2     
jahia/core/src/webapp/jsp/jahia/engines/shared/embedded_flat_filemanager.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/shared/embedded_flat_filemanager.jsp.diff?r1=1.18&r2=1.19&f=h
  
  
  
  Index: embedded_flat_filemanager.jsp
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/shared/embedded_flat_filemanager.jsp,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- embedded_flat_filemanager.jsp     5 Oct 2005 15:17:30 -0000       1.18
  +++ embedded_flat_filemanager.jsp     6 Oct 2005 13:31:44 -0000       1.19
  @@ -55,7 +55,12 @@
   
       function sendForm (path) {
           document.mainForm.file_id.value = path;
  -        document.mainForm.action += "?screen=edit&path="+path;
  +        var action = document.mainForm.action;
  +        var token = "?";
  +        if(action.indexOf(token) > 0) {
  +          token = "&";
  +        }
  +        document.mainForm.action += token+"screen=edit&path="+path;
           document.mainForm.submit();
       }
   
  @@ -115,7 +120,12 @@
   
       function handleActionChanges(param) {
           saveContent();
  -        document.mainForm.action += "?screen=" + param;
  +        var action = document.mainForm.action;
  +        var token = "?";
  +        if(action.indexOf(token) > 0) {
  +          token = "&";
  +        }
  +        document.mainForm.action += token+"screen=" + param;
           document.mainForm.submit();
       }
   //-->