[FIX] reorganize xml data (all the menu items are now in the portal_view.xml); remove...

bzr revid: abo@openerp.com-20120516151246-k9yi825av69c9b49

diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 7e2efa8..c028ec9 100644 (file)
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -42,11 +42,14 @@ module 'share'.
         'board_portal_view.xml',
         'portal_view.xml',
         'portal_menu.xml',
-        'portal_demo.xml',
+        'portal_data.xml',
         'res_user_view.xml',
         'wizard/portal_wizard_view.xml',
         'wizard/share_wizard_view.xml',
     ],
+    'demo': [
+        'portal_demo.xml',
+    ],
     'installable': True,
 }
 

diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 2289804..399377e 100644 (file)
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -97,31 +97,6 @@ class portal(osv.osv):
                 act_window_obj.write(cr, uid, action_ids, action_values, context)
         
         return True
-    
-    def do_create_menu(self, cr, uid, ids, context=None):
-        """ create a parent menu for the given portals """
-        menu_obj = self.pool.get('ir.ui.menu')
-        ir_data = self.pool.get('ir.model.data')
-        menu_root = self._res_xml_id(cr, uid, 'portal', 'portal_menu_settings')
-        
-        for p in self.browse(cr, uid, ids, context):
-            # create a menuitem under 'portal.portal_menu'
-            menu_values = {
-                'name': _('%s Menu') % p.name,
-                'parent_id': menu_root,
-                'groups_id': [(6, 0, [p.group_id.id])],
-            }
-            menu_id = menu_obj.create(cr, uid, menu_values, context)
-            # set the parent_menu_id to item_id
-            self.write(cr, uid, [p.id], {'parent_menu_id': menu_id}, context)
-            menu_values.pop('parent_id')
-            menu_values.pop('groups_id')
-            menu_values.update({'model': 'ir.ui.menu',
-                         'module': 'portal',
-                         'res_id': menu_id,
-                         'noupdate': 'True'})
-            data_id = ir_data.create(cr, uid, menu_values, context)
-        return True
 
     def _assign_menu(self, cr, uid, ids, context=None):
         """ assign portal_menu_settings to users of portals (ids) """

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
new file mode 100644 (file)
index 0000000..2cba3a1
--- /dev/null
+++ b/addons/portal/portal_data.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="portal" model="res.portal">
+            <field name="name">Portal</field>
+            <field name="group_id" ref="group_portal_member"/>
+            <field name="override_menu" eval="True"/>
+            <field name="parent_menu_id" ref="portal_members_root_menu"/>
+        </record>
+
+    </data>
+</openerp>

diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index b64e557..77b0d98 100644 (file)
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -2,11 +2,16 @@
 <openerp>
     <data>
 
-        <record id="Portal_demo" model="res.users">
+        <record id="portal_demo_user" model="res.users">
             <field name="name">Demo Portal User</field>
             <field name="login">test</field>
             <field name="password">test</field>
-            <field name="groups_id" eval="[(6,0,[ref('group_portal_member')])]"/>
+            <!-- Avoid auto-including this demo user in any default group -->
+            <field name="groups_id" eval="[]"/>
+        </record>
+
+        <record id="portal" model="res.portal">
+            <field name="users" eval="[(4,ref('portal_demo_user'))]"/>
         </record>
 
     </data>

diff --git a/addons/portal/portal_menu.xml b/addons/portal/portal_menu.xml
deleted file mode 100644 (file)
index f944191..0000000
--- a/addons/portal/portal_menu.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <menuitem name="Portal Member's Menu" id="menu_portal" parent="portal_members_root_menu" action="open_portal"/>
-
-          <menuitem name="Track Orders" id="portal_track_orders" parent="menu_portal" groups="portal.group_portal_member"/>
-          <menuitem name="Invoice and Payments" id="portal_invoice_payements" parent="menu_portal" groups="portal.group_portal_member"/>
-          <menuitem name="Services" id="portal_services" parent="menu_portal" groups="portal.group_portal_member"/>
-          <menuitem name="After Sale Services" id="portal_after_sales" parent="menu_portal" groups="portal.group_portal_member"/>
-          <menuitem name="Our company" id="portal_company" parent="menu_portal"/>
-              <menuitem name="News" id="portal_company_news" parent="portal_company"/>
-              <menuitem name="Jobs" id="portal_company_jobs" parent="portal_company"/>
-              <menuitem name="Address Book" id="portal_company_address_book" parent="portal_company" action="base.action_partner_form"/>
-              <menuitem name="Contact Us" id="portal_company_contact" parent="portal_company" action="action_contact_us"/>
-
-    </data>
-</openerp>

diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 75afa81..a4b81da 100644 (file)
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -17,9 +17,6 @@ the portal's users.
             </field>
         </record>
 
-        <menuitem name="Portals" id="portal_list_menu"
-            parent="portal_menu_settings" sequence="1" action="portal_list_action"/>
-
         <!-- portal tree view -->
         <record id="portal_list_view" model="ir.ui.view">
             <field name="name">Portal List</field>
@@ -69,7 +66,7 @@ the portal's users.
             </field>
         </record>
 
-        <record model="ir.ui.view" id="product.product_kanban_view">
+        <record id="product.product_kanban_view" model="ir.ui.view">
             <field name="name">Product Kanban</field>
             <field name="model">product.product</field>
             <field name="type">kanban</field>
@@ -104,8 +101,8 @@ the portal's users.
             </field>
         </record>
 
-        <record id="action_contact_us" model="ir.actions.act_window">
-            <field name="name">Contact Us</field>
+        <record id="action_about" model="ir.actions.act_window">
+            <field name="name">About</field>
             <field name="res_model">res.company</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -114,5 +111,64 @@ the portal's users.
             <field name="view_id" ref="base.view_company_form" />
         </record>
 
+        <!-- 
+        <record id="action_contact_us" model="ir.actions.act_window">
+            <field name="name">Contact Us</field>
+            <field name="model"></field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+         -->
+
+        <!-- contact wizard form view -->
+        <!-- 
+        <record id="wizard_form_view" model="ir.ui.view">
+            <field name="name">Contact wizard form view</field>
+            <field name="model"></field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Subscribe Attendees">
+                    <field name="session_ids" colspan="4"/>
+                    <field name="attendee_ids" colspan="4">
+                        <tree editable="bottom">
+                            <field name="name"/>
+                            <field name="partner_id"/>
+                        </tree>
+                    </field>
+                    <group colspan="4">
+                        <button string="Cancel" icon="gtk-cancel"
+                            special="cancel"/>
+                        <button string="Subscribe" icon="gtk-ok"
+                            name="action_subscribe" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        -->
+
+
+
+        <!-- module's menu -->
+        <!-- menu Administration/Portals -->
+        <menuitem name="Portals Settings" id="portal_menu_settings" parent="base.menu_administration"
+            groups="group_portal_manager"/>
+
+            <menuitem name="Portals" id="portal_list_menu" parent="portal_menu_settings" sequence="1" action="portal_list_action"/>
+
+            <!-- root menu for portal members (chrooted in this menu) -->
+            <menuitem name="Portal Members Root Menu" id="portal_members_root_menu" parent="portal_menu_settings"/>
+                <menuitem name="Portal Member's Menu" id="menu_portal" parent="portal_members_root_menu" action="open_portal"/>
+
+                  <menuitem name="Track Orders" id="portal_track_orders" parent="menu_portal"/>
+                  <menuitem name="Invoice and Payments" id="portal_invoice_payements" parent="menu_portal"/>
+                  <menuitem name="Services" id="portal_services" parent="menu_portal"/>
+                  <menuitem name="After Sale Services" id="portal_after_sales" parent="menu_portal"/>
+                  <menuitem name="Our company" id="portal_company" parent="menu_portal"/>
+                      <menuitem name="News" id="portal_company_news" parent="portal_company"/>
+                      <menuitem name="Jobs" id="portal_company_jobs" parent="portal_company"/>
+                      <menuitem name="Address Book" id="portal_company_address_book" parent="portal_company" action="base.action_partner_form"/>
+                      <!-- <menuitem name="Contact Us" id="portal_company_contact" parent="portal_company" action="action_contact_us"/> -->
+                      <menuitem name="About" id="portal_company_about" parent="portal_company" action="action_about"/>
+
     </data>
 </openerp>

diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml
index 5e72cd3..21bafbc 100644 (file)
--- a/addons/portal/security/portal_security.xml
+++ b/addons/portal/security/portal_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
 
         <!-- Don't use any implied_ids here; this group behavior is particular -->
         <record id="group_portal_member" model="res.groups">
@@ -29,19 +29,5 @@
             <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
 
-        <!-- menu Administration/Portals -->
-        <menuitem name="Portals Settings" id="portal_menu_settings" parent="base.menu_administration"
-            groups="group_portal_manager"/>
-
-        <!-- root menu for portal members (chrooted in this menu) -->
-        <menuitem name="Portal Members Root Menu" id="portal_members_root_menu" parent="portal_menu_settings"/>
-
-        <record id="portal" model="res.portal">
-            <field name="name">Portal</field>
-            <field name="group_id" ref="group_portal_member"/>
-            <field name="override_menu" eval="True"/>
-            <field name="parent_menu_id" ref="portal_members_root_menu"/>
-        </record>
-
     </data>
 </openerp>

diff --git a/addons/portal_claim/security/portal_security.xml b/addons/portal_claim/security/portal_security.xml
index ffd0f6c..635b408 100644 (file)
--- a/addons/portal_claim/security/portal_security.xml
+++ b/addons/portal_claim/security/portal_security.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-      
+    <data noupdate="1">
+
         <record id="portal_stock_picking_user_rule" model="ir.rule">
             <field name="name">Personal Claims</field>
             <field ref="crm_claim.model_crm_claim" name="model_id"/>
             <field name="domain_force">[('partner_id.email','=',user.login)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
         </record>
-        
+
     </data>
 </openerp>

diff --git a/addons/portal_event/security/portal_security.xml b/addons/portal_event/security/portal_security.xml
index 2580483..1f38ce2 100644 (file)
--- a/addons/portal_event/security/portal_security.xml
+++ b/addons/portal_event/security/portal_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <record id="portal_event_rule" model="ir.rule">
             <field name="name">Personal Events</field>

diff --git a/addons/portal_issue/security/portal_security.xml b/addons/portal_issue/security/portal_security.xml
index a6c5550..299c647 100644 (file)
--- a/addons/portal_issue/security/portal_security.xml
+++ b/addons/portal_issue/security/portal_security.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-      
+    <data noupdate="1">
+    
         <record id="portal_issue_rule" model="ir.rule">
             <field name="name">Personal Issues</field>
             <field ref="project_issue.model_project_issue" name="model_id"/>
             <field name="domain_force">[('partner_id.email','=',user.login)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
         </record>
+
         <record id="portal_task_rule" model="ir.rule">
             <field name="name">Personal Task</field>
             <field ref="project.model_project_task" name="model_id"/>
             <field name="domain_force">[('partner_id.email','=',user.login)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
         </record>
+
     </data>
 </openerp>

diff --git a/addons/portal_sale/security/portal_security.xml b/addons/portal_sale/security/portal_security.xml
index 8f0a35a..64fc3e5 100644 (file)
--- a/addons/portal_sale/security/portal_security.xml
+++ b/addons/portal_sale/security/portal_security.xml
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-        
+    <data noupdate="1">
+
         <!-- Sale Portal Access Rules -->
-        
+
         <record id="portal_sale_order_user_rule" model="ir.rule">
             <field name="name">Personal Quotations/Sales</field>
             <field ref="sale.model_sale_order" name="model_id"/>
             <field name="domain_force">[('partner_id.email','=',user.login)]</field>
             <field name="groups" eval="[(4, ref('group_portal'))]"/>
         </record>
-        
+
         <record id="portal_stock_picking_user_rule" model="ir.rule">
             <field name="name">Personal Delivery Orders</field>
             <field ref="stock.model_stock_picking" name="model_id"/>
             <field name="domain_force">[('partner_id.email','=',user.login)]</field>
             <field name="groups" eval="[(4, ref('group_portal'))]"/>
         </record>
-        
+
         <record id="portal_account_invoice_user_rule" model="ir.rule">
             <field name="name">Personal Account Invoices</field>
             <field ref="account.model_account_invoice" name="model_id"/>
             <field name="domain_force">[('partner_id.email','=',user.login)]</field>
             <field name="groups" eval="[(4, ref('group_portal'))]"/>
         </record>
-        
+
         <record id="portal_personal_payment" model="ir.rule">
             <field name="name">Personal Payments</field>
             <field ref="account_voucher.model_account_voucher" name="model_id"/>
             <field name="domain_force">[('partner_id.email','=',user.login)]</field>
             <field name="groups" eval="[(4, ref('group_portal'))]"/>
         </record>
-        
+
         <record id="portal_personal_contact" model="ir.rule">
             <field name="name">Personal Contacts</field>
             <field ref="base.model_res_partner" name="model_id"/>
             <field name="domain_force">[('email','=',user.login)]</field>
             <field name="groups" eval="[(4, ref('group_portal'))]"/>
         </record>
-        
+
     </data>
 </openerp>