openerp-dev-web team mailing list archive

["Sananaz \(Open ERP\)" <sma@xxxxxxxxxxx>]

Sananaz (Open ERP) has proposed merging lp:~openerp-dev/openobject-client-web/6.0-opw-4881-sma into lp:openobject-client-web/6.0.

Requested reviews:
  OpenERP Core Team (openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-4881-sma/+merge/60365

Hello,

Just use the frame_dialogue for view editor.

Thanks.
-- 
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-4881-sma/+merge/60365
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client-web/6.0-opw-4881-sma.

=== modified file 'addons/openerp/controllers/templates/viewed_add.mako'
--- addons/openerp/controllers/templates/viewed_add.mako	2010-06-02 08:18:17 +0000
+++ addons/openerp/controllers/templates/viewed_add.mako	2011-05-09 11:49:23 +0000
@@ -20,7 +20,7 @@
                 </select>
             </td>
             <td width="5" nowrap="nowrap">
-            	<a id="new_field" name="new_field" class="button" href="javascript: void(0)" onclick="onNew('${model}')">${_("New Field")}</a>
+                <a id="new_field" name="new_field" class="button" href="javascript: void(0)" onclick="onNew('${model}', window)">${_("New Field")}</a>
             </td>
         </tr>
         <tr>

=== modified file 'addons/openerp/controllers/templates/viewed_new.mako'
--- addons/openerp/controllers/templates/viewed_new.mako	2010-09-15 12:55:07 +0000
+++ addons/openerp/controllers/templates/viewed_new.mako	2011-05-09 11:49:23 +0000
@@ -10,17 +10,11 @@
     <script type="text/javascript">
         jQuery(document).ready(function() {
 
-            var lc = parseInt(openobject.dom.get('_terp_id').value) || 0;
-            
+            var lc = parseInt(jQuery(idSelector('_terp_id')).val()) || 0;
+
             if (lc > 0) {
-            
-                var id = parseInt(openobject.dom.get('_terp_id').value) || 0;
-                
-                if (id) {
-                    window.opener.addNewFieldName(openobject.dom.get('name').value);
-                }
-                
-                window.close();
+               window.top.jQuery(window.frameElement).data('source-window').addNewFieldName(jQuery(idSelector('name')).val());
+               window.frameElement.close();
             }
         });
     </script>

=== modified file 'addons/openerp/controllers/templates/viewed_preview.mako'
--- addons/openerp/controllers/templates/viewed_preview.mako	2010-09-15 12:55:07 +0000
+++ addons/openerp/controllers/templates/viewed_preview.mako	2011-05-09 11:49:23 +0000
@@ -25,7 +25,7 @@
                     <table border="0" cellpadding="0" cellspacing="0" width="100%">
                         <tr>
                             <td class="save_close">
-                            	<a class="button-a" href="javascript: void(0)" onclick="window.close()">${_("Close")}</a>
+                                <a class="button-a" href="javascript: void(0)" onclick="window.frameElement.close();">${_("Close")}</a>
                             </td>
                             <td width="100%">
                             </td>

=== modified file 'addons/openerp/controllers/templates/viewlist.mako'
--- addons/openerp/controllers/templates/viewlist.mako	2010-09-28 13:36:32 +0000
+++ addons/openerp/controllers/templates/viewlist.mako	2011-05-09 11:49:23 +0000
@@ -24,7 +24,7 @@
         }
 
         function doClose() {
-            window.close();
+            window.frameElement.close();
         }
 
         function onNew() {
@@ -50,10 +50,10 @@
 
             var act = openobject.http.getURL('/openerp/viewed', {view_id: boxes[0].value});
             if (window.opener) {
-                window.opener.setTimeout("openobject.tools.openWindow('" + act + "')", 0);
-                window.close();
+                window.top.setTimeout("jQuery.frame_dialog({src:'" +act+ "'})", 0);
+                window.frameElement.close()
             } else {
-                openobject.tools.openWindow(act);
+                jQuery.frame_dialog({src:act});
             }
         }
 
@@ -79,10 +79,10 @@
 
         jQuery(document).ready(function(){
 
-            if (!window.opener)
+            if (!window.top)
                 return;
 
-            var id = window.opener.document.getElementById('_terp_view_id').value;
+            var id = window.top.document.getElementById('_terp_view_id').value;
 
             if (!openobject.dom.get('_terp_list/' + id)) {
 

=== modified file 'addons/openerp/static/javascript/viewed.js'
--- addons/openerp/static/javascript/viewed.js	2011-01-17 11:57:11 +0000
+++ addons/openerp/static/javascript/viewed.js	2011-05-09 11:49:23 +0000
@@ -362,20 +362,20 @@
                                              'view_type' : openobject.dom.get('view_type').value});
 
     if (window.browser.isGecko19) {
-        return openobject.tools.openWindow(act);
+        return jQuery.frame_dialog({src:act});
     }
 
-    window.open(act);
+    return jQuery.frame_dialog({src:act});
 }
 
 function onNew(model){
     var act = openobject.http.getURL('/openerp/viewed/new_field/edit', {'for_model' : model});
-    openobject.tools.openWindow(act, {width: 650, height: 400});
+    jQuery.frame_dialog({src: act}, {'source-window': jQuery(window)[0]});
 }
 
 function onClose(){
-    window.opener.setTimeout("window.location.reload()", 1);
-    window.close();
+    window.top.setTimeout('window.location.reload()', 1);
+    window.frameElement.close();
 }
 
 function toggleFields(selector) {

=== modified file 'addons/openerp/widgets/templates/sidebar.mako'
--- addons/openerp/widgets/templates/sidebar.mako	2011-01-13 05:39:12 +0000
+++ addons/openerp/widgets/templates/sidebar.mako	2011-05-09 11:49:23 +0000
@@ -77,30 +77,30 @@
         </form>
     </div>
     % endif
-	
-	% if rpc.session.uid == 1:
-	    <div class="sideheader-a">
-	        <h2>${_("Customize")}</h2>
-	    </div>
-	    <ul class="clean-a">
-	        <li>
-	            <a title="${_('Manage views of the current object')}"
-	               onclick="openobject.tools.openWindow('/openerp/viewlist?model=${model}', {height: 400})"
-	               href="javascript: void(0)">${_("Manage Views")}</a>
-	        </li>
-	        % if id:
-	        <li>
-	            <a title="${_('Edit workflow of the current object')}"
-	               href="/view_diagram/workflow?model=${model}&amp;rec_id=${id}">${_("Edit Workflow")}</a>
-	        </li>
-	        % endif
-	        <li>
-	            <a title="${_('Customize current object or create a new object')}"
-	               onclick="jQuery.frame_dialog({src:'/openerp/viewed/new_model/edit?model=${model}'}, null, { width: '80%', max_width: 1000, height: '90%' })"
-	               href="javascript: void(0)">${_("Customize Object")}</a>
-	        </li>
-	    </ul>
-	% endif
+
+    % if rpc.session.uid == 1:
+        <div class="sideheader-a">
+            <h2>${_("Customize")}</h2>
+        </div>
+        <ul class="clean-a">
+            <li>
+                <a title="${_('Manage views of the current object')}"
+                    onclick="jQuery.frame_dialog({src:openobject.http.getURL('/openerp/viewlist?model=${model}')});"
+                    href="javascript: void(0)">${_("Manage Views")}</a>
+            </li>
+            % if id:
+            <li>
+                <a title="${_('Edit workflow of the current object')}"
+                    href="/view_diagram/workflow?model=${model}&amp;rec_id=${id}">${_("Edit Workflow")}</a>
+            </li>
+            % endif
+            <li>
+                <a title="${_('Customize current object or create a new object')}"
+                    onclick="jQuery.frame_dialog({src:'/openerp/viewed/new_model/edit?model=${model}'}, null, { width: '80%', max_width: 1000, height: '90%' })"
+                    href="javascript: void(0)">${_("Customize Object")}</a>
+            </li>
+        </ul>
+    % endif
 
     <div class="sideheader-a">
         <h2>${_("Other Options")}</h2>