[MERGE] project_issue: website portal

- Remove portal_project move rules to project
- Add issues in the /my/home frontend portal
- Remove website_project, task access is backend only

5 files changed, 53 insertions, 3 deletions

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index a1ba0411659..b336299c3db 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -356,6 +356,7 @@ class project_issue(osv.Model):
         return res_id
 
     @api.cr_uid_ids_context
+    @api.returns('mail.message', lambda value: value.id)
     def message_post(self, cr, uid, thread_id, subtype=None, context=None, **kwargs):
         """ Overrides mail_thread message_post so that we can set the date of last action field when
             a new message is posted on the issue.
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index dcd6dbd212b..da65f7f9552 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -40,7 +40,7 @@
             <field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
             <field name="priority">0</field>
             <field name="user_id" ref="base.user_root"/>
-            <field name="partner_id" ref="base.res_partner_2"/>
+            <field name="partner_id" ref="portal.partner_demo_portal"/>
             <field name="team_id" ref="sales_team.team_sales_department"/>
             <field eval="1" name="active"/>
             <field name="project_id" ref="project.project_project_1"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 6d4c73b504a..11ef31b8508 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -336,5 +336,29 @@
             </field>
         </record>
 
+        <!-- Portal -->
+        <record id="open_view_issue" model="ir.actions.act_window">     
+            <field name="name">Issues</field>      
+            <field name="res_model">project.issue</field>      
+            <field name="view_type">form</field>       
+            <field name="view_mode">tree,form</field>      
+            <field name="view_id" ref="project_issue.project_issue_tree_view"/>        
+            <field name="domain" eval=""/>     
+            <field name="context">{"search_default_user_id":'', "search_default_draft":'', "search_default_todo":'', "portal":'True'}</field>      
+            <field name="search_view_id" ref="project_issue.view_project_issue_filter"/>       
+            <field name="target">current</field>       
+            <field name="help" type="html">        
+              <p class="oe_view_nocontent_create">     
+                Click to create an issue.      
+              </p><p>      
+                You can track your issues from this menu and the action we     
+                will take.     
+              </p>     
+            </field>       
+        </record>
+        
+        <menuitem name="Issues" id="portal_services_issues" parent="portal.portal_projects"     
+                  action="open_view_issue" sequence="10"/>
+
     </data>
 </openerp>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index d23f1b06b4d..21386d80ce7 100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -6,3 +6,4 @@ access_project_issue_report_user,project.issue.report user,model_project_issue_r
 access_crm_team,crm.team,sales_team.model_crm_team,project.group_project_user,1,0,0,0

 access_project_issue_salesman,project.issue,model_project_issue,base.group_sale_salesman,1,0,0,0

 access_project_issue_manager,project.issue,model_project_issue,base.group_sale_manager,1,0,0,0

+access_project_issue_portal,project.issue,model_project_issue,base.group_portal,1,0,0,0

diff --git a/addons/project_issue/security/project_issue_security.xml b/addons/project_issue/security/project_issue_security.xml
index ea7674ea794..af8924c5697 100644
--- a/addons/project_issue/security/project_issue_security.xml
+++ b/addons/project_issue/security/project_issue_security.xml
@@ -10,10 +10,10 @@
         </record>
 
         <record model="ir.rule" id="issue_user_rule">
-            <field name="name">Project/Issue: employees: public or employee or (followers and following)</field>
+            <field name="name">Project/Issue: employees: employee or (followers and following)</field>
             <field name="model_id" ref="model_project_issue"/>
             <field name="domain_force">['|',
-                                            ('project_id.privacy_visibility', 'in', ['public', 'employees']),
+                                            ('project_id.privacy_visibility', '=', 'employees'),
                                             '&amp;',
                                                 ('project_id.privacy_visibility', '=', 'followers'),
                                                 ('message_follower_ids', 'in', [user.partner_id.id]),
@@ -21,5 +21,29 @@
             <field name="groups" eval="[(4,ref('base.group_user'))]"/>
         </record>
 
+        <record id="portal_issue_rule" model="ir.rule">
+            <field name="name">Project/Issue: portal users: (portal and colleagues following) or (followers and following)</field>
+            <field name="model_id" ref="project_issue.model_project_issue"/>
+            <field name="domain_force">['|',
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'portal'),
+                                                ('message_follower_ids', 'child_of', [user.partner_id.commercial_partner_id.id]),
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'followers'),
+                                                ('message_follower_ids', 'in', [user.partner_id.id]),
+                                        ]</field>
+            <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+        </record>
+
+        <record model="ir.rule" id="project_issue.issue_user_rule">
+            <field name="name">Project/Issue: employees: portal, employee or (followers and following)</field>
+            <field name="domain_force">['|',
+                                            ('project_id.privacy_visibility', 'in', ['portal', 'employees']),
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'followers'),
+                                                ('message_follower_ids', 'in', [user.partner_id.id]),
+                                        ]</field>
+        </record>
+
     </data>
 </openerp>