From 8df6b16784b64d4ebb375290f96a7c8e2fd4f949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 5 Feb 2014 10:04:47 +0100
Subject: [PATCH 01/11] [ADD] website: added support for invoking a server
 action through controller

website: added website/action/<id_or_xml_id> route, that runs the server action designed
by its id or xml_id. Only code server action returning a template give a result. The
template is displayed. Other or not existing server actions redirect to the homepage.

website: added an override of ir_actions_server: evaluation context gets request for
evaluation, to enable request.render(template_name); also returns template the same
way action is returned for code server action;

bzr revid: tde@openerp.com-20140205090447-2hppg7818nx1wfzh
---
 addons/website/controllers/main.py   | 31 ++++++++++++++++++++++++++--
 addons/website/data/website_data.xml | 18 ++++++++++++++++
 addons/website/models/__init__.py    |  1 +
 addons/website/models/ir_actions.py  | 26 +++++++++++++++++++++++
 4 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 addons/website/models/ir_actions.py

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index b9fc68bb667..9cd22a76e6e 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -9,7 +9,6 @@ import datetime
 
 from sys import maxint
 
-import psycopg2
 import werkzeug
 import werkzeug.exceptions
 import werkzeug.utils
@@ -27,6 +26,7 @@ logger = logging.getLogger(__name__)
 # Completely arbitrary limits
 MAX_IMAGE_WIDTH, MAX_IMAGE_HEIGHT = IMAGE_LIMITS = (1024, 768)
 
+
 class Website(openerp.addons.web.controllers.main.Home):
     #------------------------------------------------------
     # View
@@ -366,5 +366,32 @@ class Website(openerp.addons.web.controllers.main.Home):
 
         return response
 
+    #------------------------------------------------------
+    # Server actions
+    #------------------------------------------------------
+    @http.route(['/website/action/<id_or_xml_id>'], type='http', auth="public", website=True)
+    def actions_server(self, id_or_xml_id, **post):
+        cr, uid, context = request.cr, request.uid, request.context
+        res, action_id, action = None, None, None
+        ServerActions = request.registry['ir.actions.server']
 
-# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
+        # find the action_id, either an int, an int into a basestring, or an xml_id
+        if isinstance(id_or_xml_id, basestring) and '.' in id_or_xml_id:
+            action_id = request.registry['ir.model.data'].xmlid_to_res_id(request.cr, request.uid, id_or_xml_id, raise_if_not_found=False)
+        else:
+            try:
+                action_id = int(id_or_xml_id)
+            except ValueError:
+                pass
+        # check it effectively exists
+        if action_id:
+            action_ids = ServerActions.exists(cr, uid, [action_id], context=context)
+            action_id = action_ids and action_ids[0] or None
+        # run it, return only LazyResponse that are templates to be rendered
+        if action_id:
+            action_res = ServerActions.run(cr, uid, [action_id], context=context)
+            if isinstance(action_res, LazyResponse):
+                res = action_res
+        if res:
+            return res
+        return request.redirect('/')
diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 50f2d8e381e..dc50a494a49 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
+    <data noupdate="0">
+        <template id="website.test0" name="Test0">
+            <p>Super cacaprout</p>
+        </template>
+
+        <record id="action_website_test" model="ir.actions.server">
+            <field name="name">Website Test</field>
+            <field name="condition">True</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="code">
+values = {}
+template = request.website.render("website.test0", values)
+            </field>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
+        </record>
+    </data>
+
     <data noupdate="1">
         <record id="default_website" model="website">
             <field name="name">www.openerp.com</field>
diff --git a/addons/website/models/__init__.py b/addons/website/models/__init__.py
index e17fba63e39..da3c232a24e 100644
--- a/addons/website/models/__init__.py
+++ b/addons/website/models/__init__.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import ir_actions
 import ir_ui_view
 import website
 import ir_qweb
diff --git a/addons/website/models/ir_actions.py b/addons/website/models/ir_actions.py
new file mode 100644
index 00000000000..c6b71e51e1e
--- /dev/null
+++ b/addons/website/models/ir_actions.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+
+from openerp.addons.web.http import request
+from openerp.osv import fields, osv
+
+
+class actions_server(osv.Model):
+    """ Add website option in server actions. """
+    _name = 'ir.actions.server'
+    _inherit = ['ir.actions.server']
+
+    # _columns = {
+    #     'website': fields.boolean('Website Stuff'),
+    # }
+
+    def _get_eval_context(self, cr, uid, action, context=None):
+        eval_context = super(actions_server, self)._get_eval_context(cr, uid, action, context=context)
+        if action.state == 'code':
+            eval_context['request'] = request
+        return eval_context
+
+    def run_action_code_multi(self, cr, uid, action, eval_context=None, context=None):
+        res = super(actions_server, self).run_action_code_multi(cr, uid, action, eval_context, context)
+        if 'template' in eval_context:
+            return eval_context['template']
+        return res

From 1e6f81abc2ae0d1c19fbdad333bc1df2208daea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 5 Feb 2014 10:45:30 +0100
Subject: [PATCH 02/11] [IMP] website: ir_actions_server: only published server
 action can be invoked from the front-end

bzr revid: tde@openerp.com-20140205094530-k058ealuxq9hbrdw
---
 addons/website/__openerp__.py        |  3 ++-
 addons/website/controllers/main.py   | 12 +++++++++---
 addons/website/data/website_data.xml |  1 +
 addons/website/models/ir_actions.py  | 10 +++++++---
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/addons/website/__openerp__.py b/addons/website/__openerp__.py
index 7779686c041..4cfabd942ca 100644
--- a/addons/website/__openerp__.py
+++ b/addons/website/__openerp__.py
@@ -20,12 +20,13 @@ OpenERP Website CMS
         'views/snippets.xml',
         'views/themes.xml',
         'views/res_config.xml',
+        'views/ir_actions.xml',
     ],
     'demo': [
         'data/website_demo.xml',
     ],
     'js': ['static/src/js/website.backend.js'],
-    'qweb' : ['static/src/xml/website.backend.xml'],
+    'qweb': ['static/src/xml/website.backend.xml'],
     'css': ['static/src/css/website.backend.css'],
     'application': True,
 }
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 9cd22a76e6e..29d2652ba94 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -374,6 +374,10 @@ class Website(openerp.addons.web.controllers.main.Home):
         cr, uid, context = request.cr, request.uid, request.context
         res, action_id, action = None, None, None
         ServerActions = request.registry['ir.actions.server']
+        # add the post values in the context, to be able to handle it
+        if context is None:
+            context = {}
+        context.get('post', {}).update(post)
 
         # find the action_id, either an int, an int into a basestring, or an xml_id
         if isinstance(id_or_xml_id, basestring) and '.' in id_or_xml_id:
@@ -389,9 +393,11 @@ class Website(openerp.addons.web.controllers.main.Home):
             action_id = action_ids and action_ids[0] or None
         # run it, return only LazyResponse that are templates to be rendered
         if action_id:
-            action_res = ServerActions.run(cr, uid, [action_id], context=context)
-            if isinstance(action_res, LazyResponse):
-                res = action_res
+            action = ServerActions.browse(cr, uid, action_id, context=context)
+            if action.state == 'code' and action.website_published:
+                action_res = ServerActions.run(cr, uid, [action_id], context=context)
+                if isinstance(action_res, LazyResponse):
+                    res = action_res
         if res:
             return res
         return request.redirect('/')
diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index dc50a494a49..85476c8f7fe 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -8,6 +8,7 @@
         <record id="action_website_test" model="ir.actions.server">
             <field name="name">Website Test</field>
             <field name="condition">True</field>
+            <field name="website_published" eval="True"/>
             <field name="model_id" ref="base.model_res_partner"/>
             <field name="code">
 values = {}
diff --git a/addons/website/models/ir_actions.py b/addons/website/models/ir_actions.py
index c6b71e51e1e..e47c3496f31 100644
--- a/addons/website/models/ir_actions.py
+++ b/addons/website/models/ir_actions.py
@@ -9,9 +9,13 @@ class actions_server(osv.Model):
     _name = 'ir.actions.server'
     _inherit = ['ir.actions.server']
 
-    # _columns = {
-    #     'website': fields.boolean('Website Stuff'),
-    # }
+    _columns = {
+        'website_published': fields.boolean(
+            'Available on the Website',
+            help='A Code server action can be run using a dedicated controller. Set'
+                 'this field as True to allow users to run this action. If it is False'
+                 'the action cannot be run through the dedicated controller.'),
+    }
 
     def _get_eval_context(self, cr, uid, action, context=None):
         eval_context = super(actions_server, self)._get_eval_context(cr, uid, action, context=context)

From 5ec4259a34be606c9041db64068d54436e10415b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 5 Feb 2014 11:10:51 +0100
Subject: [PATCH 03/11] [IMP] website: removed dummy data used for testing,
 added a first demo template + server action callable through the front-end,
 working on partners. Some king of simple partner directory.

bzr revid: tde@openerp.com-20140205101051-d9ysg4fel30g2cgy
---
 addons/website/data/website_data.xml | 19 -----------
 addons/website/data/website_demo.xml | 47 ++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 85476c8f7fe..50f2d8e381e 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -1,24 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="0">
-        <template id="website.test0" name="Test0">
-            <p>Super cacaprout</p>
-        </template>
-
-        <record id="action_website_test" model="ir.actions.server">
-            <field name="name">Website Test</field>
-            <field name="condition">True</field>
-            <field name="website_published" eval="True"/>
-            <field name="model_id" ref="base.model_res_partner"/>
-            <field name="code">
-values = {}
-template = request.website.render("website.test0", values)
-            </field>
-            <field name="state">code</field>
-            <field name="type">ir.actions.server</field>
-        </record>
-    </data>
-
     <data noupdate="1">
         <record id="default_website" model="website">
             <field name="name">www.openerp.com</field>
diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index d23bc50c817..66919daf960 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -1,5 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
+    <data noupdate="1">
+
+        <template id="template_partner_demo" name="Partner Template (Server Action Demo)">
+<t t-call="website.layout">
+    <t t-set="additional_title">Members</t>
+    <div id="wrap">
+        <div class="oe_structure">
+            <section data-snippet-id="title">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <h1 class="text-center">Our Members Directory</h1>
+                            <h3 class="text-muted text-center">Find a business partner</h3>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </div>
+        <div class="container">
+            <t t-foreach="partners" t-as="partner">
+                <div class="row">
+                    <span t-field="partner.name"/>
+                </div>
+            </t>
+        </div>
+    </div>
+</t>
+        </template>
+
+        <record id="action_partner_demo" model="ir.actions.server">
+            <field name="name">Website Test</field>
+            <field name="condition">True</field>
+            <field name="website_published" eval="True"/>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="code">
+partner_ids = pool['res.partner'].search(cr, uid, [('customer', '=', True)], context=context)
+partners = pool['res.partner'].browse(cr, uid, partner_ids, context=context)
+values = {
+    'partners': partners,
+}
+template = request.website.render("website.template_partner_demo", values)
+            </field>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
+        </record>
+    </data>
+
     <data>
 
         <record id="default_website" model="website">

From 1c608569ca96fad950781cb330a122e7a3b83ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 5 Feb 2014 11:55:55 +0100
Subject: [PATCH 04/11] [IMP] website: server action in front-end: updated demo
 data to show something vaguely complex that 'everyone' can do using 2 server
 actions and 2 templates: a basic partner directory.

bzr revid: tde@openerp.com-20140205105555-hzpwwqgefdiy12jg
---
 addons/website/controllers/main.py   |   2 +-
 addons/website/data/website_demo.xml | 114 ++++++++++++++++++++++-----
 2 files changed, 97 insertions(+), 19 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 29d2652ba94..c043ff82458 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -377,7 +377,7 @@ class Website(openerp.addons.web.controllers.main.Home):
         # add the post values in the context, to be able to handle it
         if context is None:
             context = {}
-        context.get('post', {}).update(post)
+        context['post'] = post or {}
 
         # find the action_id, either an int, an int into a basestring, or an xml_id
         if isinstance(id_or_xml_id, basestring) and '.' in id_or_xml_id:
diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index 66919daf960..57480eedd92 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -1,10 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
+
+        <record id="default_website" model="website">
+            <field name="social_twitter">https://twitter.com/openerp</field>
+            <field name="social_facebook">https://www.facebook.com/OpenERP</field>
+            <field name="social_googleplus">https://plus.google.com/+openerp</field>
+            <field name="social_linkedin">http://www.linkedin.com/company/openerp</field>
+        </record>
+
+        <record id="base.main_company" model="res.company">
+            <field name="rml_header1">Great Product for Great People</field>
+        </record>
+    </data>
+
+    <data noupdate="0">
+
+        <!--
+            Some demo data for front-end server action generating templates
+            -->
+
+        <template id="template_partner_detail_demo" name="Partner Details Template (Server Action Demo)">
+<t t-call="website.layout">
+    <t t-set="additional_title">Partner Detail</t>
+    <div id="wrap">
+        <div class="oe_structure">
+            <section data-snippet-id="title">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <h1 class="text-center">Our Members Directory</h1>
+                            <h3 class="text-muted text-center">Find a business partner</h3>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </div>
+        <div class="container">
+            <div class="row" t-if="partner">
+                <h2 t-field="partner.name"/>
+                <div class="col-md-2 mt32">
+                    <img t-att-src="'/website/image?model=res.partner&amp;field=image_medium&amp;id=%s' % partner.id"/>
+                </div>
+                <address class="col-md-6 mt32">
+                    <table style="margin: auto;" class="well">
+                        <colgroup>
+                            <col width="100"/>
+                            <col/>
+                        </colgroup>
+                        <tbody>
+                            <t t-set="address" t-value="'&lt;br/&gt;'.join(partner.name_get()[0][1].split('\n')[1:])"/>
+                            <tr><th class="texttop">Address</th><td t-raw="address"/></tr>
+                            <tr><th>Website</th><td><span t-field="partner.website"/></td></tr>
+                            <tr><th>Phone</th><td><span t-field="partner.phone"/></td></tr>
+                            <tr><th>Tel</th><td><span t-field="partner.mobile"/></td></tr>
+                            <tr><th>Fax</th><td><span t-field="partner.fax"/></td></tr>
+                            <tr><th>Email</th><td><span t-field="partner.email"/></td></tr>
+                        </tbody>
+                    </table>
+                </address>
+            </div>
+        </div>
+    </div>
+</t>
+        </template>
+
+        <record id="action_partner_detail_demo" model="ir.actions.server">
+            <field name="name">Website Partner Detail Demo</field>
+            <field name="condition">True</field>
+            <field name="website_published" eval="True"/>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="code">
+partner_id, partner = False, None
+post_partner_id = context.get('post', {}).get('partner_id')
+if post_partner_id:
+    try:
+        post_partner_id = int(post_partner_id)
+    except ValueError:
+        post_partner_id = False
+if post_partner_id:
+    partner_ids = pool['res.partner'].search(cr, uid, [('id', '=', post_partner_id)], context=context)
+    partner_id = partner_ids and partner_ids[0] or False
+if partner_id:
+    partner = pool['res.partner'].browse(cr, uid, partner_id, context=context)
+values = {
+    'partner': partner,
+}
+template = request.website.render("website.template_partner_detail_demo", values)
+            </field>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
+        </record>
 
         <template id="template_partner_demo" name="Partner Template (Server Action Demo)">
 <t t-call="website.layout">
-    <t t-set="additional_title">Members</t>
+    <t t-set="additional_title">Partners</t>
     <div id="wrap">
         <div class="oe_structure">
             <section data-snippet-id="title">
@@ -21,7 +111,9 @@
         <div class="container">
             <t t-foreach="partners" t-as="partner">
                 <div class="row">
-                    <span t-field="partner.name"/>
+                    <a t-att-href="'/website/action/website.action_partner_detail_demo?partner_id=%d' % partner.id">
+                        <span t-field="partner.name"/>
+                    </a>
                 </div>
             </t>
         </div>
@@ -30,7 +122,7 @@
         </template>
 
         <record id="action_partner_demo" model="ir.actions.server">
-            <field name="name">Website Test</field>
+            <field name="name">Website Partners Demo</field>
             <field name="condition">True</field>
             <field name="website_published" eval="True"/>
             <field name="model_id" ref="base.model_res_partner"/>
@@ -46,18 +138,4 @@ template = request.website.render("website.template_partner_demo", values)
             <field name="type">ir.actions.server</field>
         </record>
     </data>
-
-    <data>
-
-        <record id="default_website" model="website">
-            <field name="social_twitter">https://twitter.com/openerp</field>
-            <field name="social_facebook">https://www.facebook.com/OpenERP</field>
-            <field name="social_googleplus">https://plus.google.com/+openerp</field>
-            <field name="social_linkedin">http://www.linkedin.com/company/openerp</field>
-        </record>
-
-        <record id="base.main_company" model="res.company">
-            <field name="rml_header1">Great Product for Great People</field>
-        </record>
-    </data>
 </openerp>

From 8d1713170aa4d247b4496aeaeaab64df737642db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 5 Feb 2014 12:01:18 +0100
Subject: [PATCH 05/11] [FIX] website: server action demo data: ValueError is
 not defined, do something generic

bzr revid: tde@openerp.com-20140205110118-6c5mq24x8e806vvn
---
 addons/website/data/website_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index 57480eedd92..364012f89c8 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -76,7 +76,7 @@ post_partner_id = context.get('post', {}).get('partner_id')
 if post_partner_id:
     try:
         post_partner_id = int(post_partner_id)
-    except ValueError:
+    except:
         post_partner_id = False
 if post_partner_id:
     partner_ids = pool['res.partner'].search(cr, uid, [('id', '=', post_partner_id)], context=context)

From ba962f9b1c811f16fc8683e8541befdb1bfc4517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 5 Feb 2014 13:37:37 +0100
Subject: [PATCH 06/11] [ADD] website: added forgottent view file for
 ir_actions

bzr revid: tde@openerp.com-20140205123737-o7btwj3xryosnayo
---
 addons/website/views/ir_actions.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 addons/website/views/ir_actions.xml

diff --git a/addons/website/views/ir_actions.xml b/addons/website/views/ir_actions.xml
new file mode 100644
index 00000000000..0b017a43192
--- /dev/null
+++ b/addons/website/views/ir_actions.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="view_server_action_form_website">
+            <field name="name">ir.actions.server.form.website</field>
+            <field name="model">ir.actions.server</field>
+            <field name="inherit_id" ref="base.view_server_action_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='state']" position="after">
+                    <field name="website_published"
+                        attrs="{'invisible': [('state', '!=', 'code')]}"/>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>

From 79d6a1a39aa1f5a45ae7371f00068023bfd8952d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 5 Feb 2014 15:02:16 +0100
Subject: [PATCH 07/11] [IMP] website: server action controller: no need to add
 post, everything is on request

bzr revid: tde@openerp.com-20140205140216-r6oxlbbmypd3u5vf
---
 addons/website/controllers/main.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index c043ff82458..e97a3be9d97 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -374,10 +374,6 @@ class Website(openerp.addons.web.controllers.main.Home):
         cr, uid, context = request.cr, request.uid, request.context
         res, action_id, action = None, None, None
         ServerActions = request.registry['ir.actions.server']
-        # add the post values in the context, to be able to handle it
-        if context is None:
-            context = {}
-        context['post'] = post or {}
 
         # find the action_id, either an int, an int into a basestring, or an xml_id
         if isinstance(id_or_xml_id, basestring) and '.' in id_or_xml_id:

From 89d053111ff6c2f45795cfc8bc71b963d6232994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 5 Feb 2014 15:02:38 +0100
Subject: [PATCH 08/11] [IMP] website: server action: response is a better
 keyworkd than template

bzr revid: tde@openerp.com-20140205140238-liili9v4l0a074zj
---
 addons/website/models/ir_actions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website/models/ir_actions.py b/addons/website/models/ir_actions.py
index e47c3496f31..47f5124f887 100644
--- a/addons/website/models/ir_actions.py
+++ b/addons/website/models/ir_actions.py
@@ -25,6 +25,6 @@ class actions_server(osv.Model):
 
     def run_action_code_multi(self, cr, uid, action, eval_context=None, context=None):
         res = super(actions_server, self).run_action_code_multi(cr, uid, action, eval_context, context)
-        if 'template' in eval_context:
-            return eval_context['template']
+        if 'response' in eval_context:
+            return eval_context['response']
         return res

From 9487dafd12877aea2960faabbd5c84b57f78f0fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 5 Feb 2014 15:15:15 +0100
Subject: [PATCH 09/11] [IMP] website: server action in front-end: improved
 demo data, a mini posting mechanism

bzr revid: tde@openerp.com-20140205141515-z0yfu11iufq0qqdk
---
 addons/website/data/website_demo.xml | 83 +++++++++++++---------------
 1 file changed, 38 insertions(+), 45 deletions(-)

diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index 364012f89c8..52fb7dd2238 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -20,7 +20,7 @@
             Some demo data for front-end server action generating templates
             -->
 
-        <template id="template_partner_detail_demo" name="Partner Details Template (Server Action Demo)">
+        <template id="template_partner_post" name="Partner Post and Thanks (Website Server Action Demo)">
 <t t-call="website.layout">
     <t t-set="additional_title">Partner Detail</t>
     <div id="wrap">
@@ -29,50 +29,25 @@
                 <div class="container">
                     <div class="row">
                         <div class="col-md-12">
-                            <h1 class="text-center">Our Members Directory</h1>
-                            <h3 class="text-muted text-center">Find a business partner</h3>
+                            <h2>Thank you for posting a message !</h2>
                         </div>
                     </div>
                 </div>
             </section>
         </div>
-        <div class="container">
-            <div class="row" t-if="partner">
-                <h2 t-field="partner.name"/>
-                <div class="col-md-2 mt32">
-                    <img t-att-src="'/website/image?model=res.partner&amp;field=image_medium&amp;id=%s' % partner.id"/>
-                </div>
-                <address class="col-md-6 mt32">
-                    <table style="margin: auto;" class="well">
-                        <colgroup>
-                            <col width="100"/>
-                            <col/>
-                        </colgroup>
-                        <tbody>
-                            <t t-set="address" t-value="'&lt;br/&gt;'.join(partner.name_get()[0][1].split('\n')[1:])"/>
-                            <tr><th class="texttop">Address</th><td t-raw="address"/></tr>
-                            <tr><th>Website</th><td><span t-field="partner.website"/></td></tr>
-                            <tr><th>Phone</th><td><span t-field="partner.phone"/></td></tr>
-                            <tr><th>Tel</th><td><span t-field="partner.mobile"/></td></tr>
-                            <tr><th>Fax</th><td><span t-field="partner.fax"/></td></tr>
-                            <tr><th>Email</th><td><span t-field="partner.email"/></td></tr>
-                        </tbody>
-                    </table>
-                </address>
-            </div>
-        </div>
     </div>
 </t>
         </template>
 
-        <record id="action_partner_detail_demo" model="ir.actions.server">
+        <record id="action_partner_post" model="ir.actions.server">
             <field name="name">Website Partner Detail Demo</field>
             <field name="condition">True</field>
             <field name="website_published" eval="True"/>
             <field name="model_id" ref="base.model_res_partner"/>
             <field name="code">
 partner_id, partner = False, None
-post_partner_id = context.get('post', {}).get('partner_id')
+post_partner_id = request.params.get('partner_id')
+post_body = request.params.get('body')
 if post_partner_id:
     try:
         post_partner_id = int(post_partner_id)
@@ -81,18 +56,18 @@ if post_partner_id:
 if post_partner_id:
     partner_ids = pool['res.partner'].search(cr, uid, [('id', '=', post_partner_id)], context=context)
     partner_id = partner_ids and partner_ids[0] or False
-if partner_id:
-    partner = pool['res.partner'].browse(cr, uid, partner_id, context=context)
+if partner_id and post_body:
+    partner = pool['res.partner'].message_post(cr, uid, partner_id, body=post_body, subtype='mail.mt_comment', context=context)
 values = {
     'partner': partner,
 }
-template = request.website.render("website.template_partner_detail_demo", values)
+response = request.website.render("website.template_partner_post", values)
             </field>
             <field name="state">code</field>
             <field name="type">ir.actions.server</field>
         </record>
 
-        <template id="template_partner_demo" name="Partner Template (Server Action Demo)">
+        <template id="template_partner_comment" name="Partner Comment (Website Server Action Demo)">
 <t t-call="website.layout">
     <t t-set="additional_title">Partners</t>
     <div id="wrap">
@@ -101,27 +76,45 @@ template = request.website.render("website.template_partner_detail_demo", values
                 <div class="container">
                     <div class="row">
                         <div class="col-md-12">
-                            <h1 class="text-center">Our Members Directory</h1>
-                            <h3 class="text-muted text-center">Find a business partner</h3>
+                            <h1 class="text-center">Send a Message to our Partners</h1>
+                            <h3 class="text-muted text-center">Discuss and Comments</h3>
                         </div>
                     </div>
                 </div>
             </section>
         </div>
         <div class="container">
-            <t t-foreach="partners" t-as="partner">
-                <div class="row">
-                    <a t-att-href="'/website/action/website.action_partner_detail_demo?partner_id=%d' % partner.id">
-                        <span t-field="partner.name"/>
-                    </a>
-                </div>
-            </t>
+            <div class="row">
+                <form class="form-horizontal" action="/website/action/website.action_partner_post" method="post">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">Recipient</label>
+                        <div class="col-sm-10">
+                            <select t-if="partners" name="partner_id" class="form-control">
+                                <t t-foreach="partners" t-as="partner"><option t-att-value="partner.id" t-esc="partner.name"/></t>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">Message</label>
+                        <div class="col-sm-10">
+                            <textarea name="body" rows="10" class="form-control"/>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="col-sm-offset-2 col-sm-10">
+                            <button type="submit" class="btn btn-default btn-primary">
+                                Send <span class="fa fa-long-arrow-right"/>
+                            </button>
+                        </div>
+                    </div>
+                </form>
+            </div>
         </div>
     </div>
 </t>
         </template>
 
-        <record id="action_partner_demo" model="ir.actions.server">
+        <record id="action_partner_comment" model="ir.actions.server">
             <field name="name">Website Partners Demo</field>
             <field name="condition">True</field>
             <field name="website_published" eval="True"/>
@@ -132,7 +125,7 @@ partners = pool['res.partner'].browse(cr, uid, partner_ids, context=context)
 values = {
     'partners': partners,
 }
-template = request.website.render("website.template_partner_demo", values)
+response = request.website.render("website.template_partner_comment", values)
             </field>
             <field name="state">code</field>
             <field name="type">ir.actions.server</field>

From 91abbeda24ea59035c24ac26950a1100ca254814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 6 Feb 2014 09:19:21 +0100
Subject: [PATCH 10/11] [DOC] website: ir_actions: added some comments

bzr revid: tde@openerp.com-20140206081921-vp22x256vkk3ea1o
---
 addons/website/models/ir_actions.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/website/models/ir_actions.py b/addons/website/models/ir_actions.py
index 47f5124f887..731ee4c47e6 100644
--- a/addons/website/models/ir_actions.py
+++ b/addons/website/models/ir_actions.py
@@ -12,18 +12,23 @@ class actions_server(osv.Model):
     _columns = {
         'website_published': fields.boolean(
             'Available on the Website',
-            help='A Code server action can be run using a dedicated controller. Set'
-                 'this field as True to allow users to run this action. If it is False'
-                 'the action cannot be run through the dedicated controller.'),
+            help='A code server action can be executed from the website, using a dedicated'
+                 'controller. The address is <base>/website/action/<id_or_xml_id>.'
+                 'Set this field as True to allow users to run this action. If it'
+                 'set to is False the action cannot be run through the website.'),
     }
 
     def _get_eval_context(self, cr, uid, action, context=None):
+        """ Override to add the request object in eval_context. """
         eval_context = super(actions_server, self)._get_eval_context(cr, uid, action, context=context)
         if action.state == 'code':
             eval_context['request'] = request
         return eval_context
 
     def run_action_code_multi(self, cr, uid, action, eval_context=None, context=None):
+        """ Override to allow returning response the same way action is already
+        returned by the basic server action behavior. Note that response has
+        priority over action, avoid using both. """
         res = super(actions_server, self).run_action_code_multi(cr, uid, action, eval_context, context)
         if 'response' in eval_context:
             return eval_context['response']

From 8860002d41968723836f6f44b71244186464a5b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 6 Feb 2014 09:21:05 +0100
Subject: [PATCH 11/11] [IMP] website: demo: set new demo as noupdate + updated
 some action name

bzr revid: tde@openerp.com-20140206082105-vsmjn9c48a0hrfyo
---
 addons/website/data/website_demo.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index 52fb7dd2238..a7fa4d76a07 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -14,7 +14,7 @@
         </record>
     </data>
 
-    <data noupdate="0">
+    <data noupdate="1">
 
         <!--
             Some demo data for front-end server action generating templates
@@ -40,7 +40,7 @@
         </template>
 
         <record id="action_partner_post" model="ir.actions.server">
-            <field name="name">Website Partner Detail Demo</field>
+            <field name="name">Website Partner Post and Thanks Demo</field>
             <field name="condition">True</field>
             <field name="website_published" eval="True"/>
             <field name="model_id" ref="base.model_res_partner"/>
@@ -115,7 +115,7 @@ response = request.website.render("website.template_partner_post", values)
         </template>
 
         <record id="action_partner_comment" model="ir.actions.server">
-            <field name="name">Website Partners Demo</field>
+            <field name="name">Website Partners Comment Form</field>
             <field name="condition">True</field>
             <field name="website_published" eval="True"/>
             <field name="model_id" ref="base.model_res_partner"/>