diff options
| -rw-r--r-- | addons/auth_signup/auth_signup_data.xml | 2 | ||||
| -rw-r--r-- | addons/portal/portal_data.xml | 78 | ||||
| -rw-r--r-- | addons/portal/portal_demo.xml | 43 | ||||
| -rw-r--r-- | addons/portal/portal_view.xml | 4 |
4 files changed, 4 insertions, 123 deletions
diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml index f153f03237d..c14a79b417f 100644 --- a/addons/auth_signup/auth_signup_data.xml +++ b/addons/auth_signup/auth_signup_data.xml @@ -10,7 +10,7 @@ <field name="password"></field> <field name="active" eval="False"/> <!-- Avoid auto-including this user in any default group, just like a typical portal member --> - <field name="groups_id" eval="[(5,)]"/> + <field name="groups_id" eval="[(4,ref('base.group_portal')]"/> <!-- allow signuped users to have a alias --> <field name="alias_name">_usertemplate</field> </record> diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml index 3fec4d7e1ee..985c2791926 100644 --- a/addons/portal/portal_data.xml +++ b/addons/portal/portal_data.xml @@ -2,78 +2,12 @@ <openerp> <data noupdate="1"> - <!-- The portal group --> + <!-- The portal group add flag is_portal --> <record id="base.group_portal" model="res.groups"> - <field name="name">Portal</field> - <field name="comment">Portal members have specific access rights (such as record rules and restricted menus). - They usually do not belong to the usual OpenERP groups.</field> <field name="is_portal" eval="True"/> - <!-- Insert the template user from auth_signup in the portal members group --> - <field name="users" eval="[(4,ref('auth_signup.default_template_user'))]"/> </record> - - <!-- Mail group for the company's news --> - <record id="company_news_feed" model="mail.group"> - <field name="name">Company News</field> - <field name="public">public</field> - </record> - - <record id="action_news" model="ir.actions.client"> - <field name="name">News</field> - <field name="tag">mail.wall</field> - <field name="res_model">mail.group</field> - <field name="params" eval="{ - 'domain': [ - ('model', '=', 'mail.group'), - ('res_id', '=', ref('company_news_feed')) - ], - 'context':{ - 'search_default_message_unread': False, - 'default_model': 'mail.group', - 'default_res_id': ref('company_news_feed'), - }, - 'readonly': True, - 'show_link': False, - 'res_model': 'mail.message', - 'thread_level': 1, - }"/> - <field name="help" type="html"> - <p> - Youd don't have unread company's news. - </p> - </field> - </record> - - <!-- Mail group for the company's jobs --> - <record id="company_jobs" model="mail.group"> - <field name="name">Company Jobs</field> - <field name="public">public</field> - </record> - - <record id="action_jobs" model="ir.actions.client"> - <field name="name">Jobs</field> - <field name="tag">mail.wall</field> - <field name="res_model">mail.group</field> - <field name="params" eval="{ - 'domain':[ - ('model', '=', 'mail.group'), - ('res_id', '=', ref('company_jobs')) - ], - 'context':{ - 'search_default_message_unread': False, - 'default_model': 'mail.group', - 'default_res_id': ref('company_jobs'), - }, - 'readonly': True, - 'show_link': False, - 'res_model': 'mail.message', - 'thread_level': 1, - }"/> - <field name="help" type="html"> - <p> - Youd don't have unread job offers. - </p> - </field> + <record id="auth_signup.default_template_user" model="res.users"> + <field name="share" eval="True"/> </record> <record id="paypal_acquirer" model="portal.payment.acquirer"> @@ -93,10 +27,4 @@ </record> </data> - - <data> - <record id="auth_signup.default_template_user" model="res.users"> - <field name="share" eval="True"/> - </record> - </data> </openerp> diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml index c1c67ad9067..3abc9c8cef5 100644 --- a/addons/portal/portal_demo.xml +++ b/addons/portal/portal_demo.xml @@ -30,48 +30,5 @@ Mr Demo Portal</field> <field name="users" eval="[(4,ref('demo_user0'))]"/> </record> - <!-- Company news and comments --> - <record id="message_company_news0" model="mail.message"> - <field name="subject">Our company's first blog-post !</field> - <field name="model">mail.group</field> - <field name="res_id" ref="company_news_feed"/> - <field name="body"><![CDATA[<p>Hello, and welcome to our company's portal !</p> -<p>It is a great pleasure to announce you the creation of our portal by writing this first news! As you may have seen, a new discussion group is now present under your 'My groups' menu: <b>Company's News</b>. We will post news about the company and its employees in this discussion group. Moreover, we will be able to communicate with our partners that are given the opportunity to join us in our portal.</p> -<p>A new era of communication has begun! <b>Feel free to post your feelings about our portal by replying on this message!</b></p>]]></field> - <field name="type">comment</field> - <field name="subtype_id" ref="mail.mt_comment"/> - <field name="author_id" ref="base.partner_root"/> - </record> - - <record id="message_company_news0_comment0" model="mail.message"> - <field name="model">mail.group</field> - <field name="res_id" ref="company_news_feed"/> - <field name="body"><![CDATA[<p>As your first portal member, I am very pleased to be able to communicate directly with you. Be sure I'll read all news carefully!</p>]]></field> - <field name="parent_id" ref="message_company_news0"/> - <field name="type">comment</field> - <field name="subtype_id" ref="mail.mt_comment"/> - <field name="author_id" ref="partner_demo_portal"/> - </record> - - <record id="message_company_news0_comment1" model="mail.message"> - <field name="model">mail.group</field> - <field name="res_id" ref="company_news_feed"/> - <field name="body"><![CDATA[<p>That's good news! As said by <i>Demo Portal User</i> in the previous post, I'm looking forward to hearing from you!</p>]]></field> - <field name="parent_id" ref="message_company_news0"/> - <field name="type">comment</field> - <field name="subtype_id" ref="mail.mt_comment"/> - <field name="author_id" ref="base.res_partner_1"/> - </record> - - <record id="message_company_news0_comment2" model="mail.message"> - <field name="model">mail.group</field> - <field name="res_id" ref="company_news_feed"/> - <field name="body"><![CDATA[<p>This feature is really great! We will be able to communicate directly to our partners!</p>]]></field> - <field name="parent_id" ref="message_company_news0"/> - <field name="type">comment</field> - <field name="subtype_id" ref="mail.mt_comment"/> - <field name="author_id" ref="base.partner_demo"/> - </record> - </data> </openerp> diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml index bd2b6a251b2..6ba5c3a315b 100644 --- a/addons/portal/portal_view.xml +++ b/addons/portal/portal_view.xml @@ -111,10 +111,6 @@ <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="30"/> <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/> - <menuitem name="About Us" id="portal_company" parent="portal_menu" sequence="200"/> - <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/> - <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/> - <!-- extend res.groups search view --> <record id="group_search_view" model="ir.ui.view"> <field name="name">Group Search</field> |