Changeset 1509 for trunk/phpgwapi

Timestamp:

10/13/09 14:59:36 (15 years ago)

Author:

amuller

Message:

Ticket #628 - Corrigindo problema de janela pai em determinados domínios

Location:

trunk/phpgwapi/templates

Files:

• classic/js/listUsers.js (modified) (1 diff)
• default/js/listUsers.js (modified) (1 diff)

trunk/phpgwapi/templates/classic/js/listUsers.js

@@ -47 +47 @@
                 newScreenX  = screen.width - newWidth;          
                 newScreenY  = 0;
-
-                window.open('phpgwapi/templates/celepar/listUsers.php?'+(type == 'g' ? 'type=g&' : '')+'currentApp='+currentApp,"","width="+newWidth+",height="+newHeight+",screenX="+newScreenX+",left="+newScreenX+",screenY="+newScreenY+",top="+newScreenY+",status=1,toolbar=no,scrollbars=yes,resizable=no");
-                
+                var rootPath = document.location.toString();
+                window.open(rootPath.substr(0,rootPath.lastIndexOf('/'))+'/phpgwapi/templates/celepar/listUsers.php?'+(type == 'g' ? 'type=g&' : '')+'currentApp='+currentApp,"","width="+newWidth+",height="+newHeight+",screenX="+newScreenX+",left="+newScreenX+",screenY="+newScreenY+",top="+newScreenY+",status=1,toolbar=no,scrollbars=yes,resizable=no");
         }
                                                                                         

trunk/phpgwapi/templates/default/js/listUsers.js

@@ -47 +47 @@
                 newScreenX  = screen.width - newWidth;          
                 newScreenY  = 0;
-
-                window.open('phpgwapi/templates/celepar/listUsers.php?'+(type == 'g' ? 'type=g&' : '')+'currentApp='+currentApp,"","width="+newWidth+",height="+newHeight+",screenX="+newScreenX+",left="+newScreenX+",screenY="+newScreenY+",top="+newScreenY+",status=1,toolbar=no,scrollbars=yes,resizable=no");
+                var rootPath = document.location.toString();
+                window.open(rootPath.substr(0,rootPath.lastIndexOf('/'))+'/phpgwapi/templates/celepar/listUsers.php?'+(type == 'g' ? 'type=g&' : '')+'currentApp='+currentApp,"","width="+newWidth+",height="+newHeight+",screenX="+newScreenX+",left="+newScreenX+",screenY="+newScreenY+",top="+newScreenY+",status=1,toolbar=no,scrollbars=yes,resizable=no");
                 
         }