[IMP] website: res_config

bzr revid: chm@openerp.com-20140127180059-sfwyqf57eixr8dxq

diff --git a/addons/website/models/res_config.py b/addons/website/models/res_config.py
index f2c56a9..9823d28 100644 (file)
--- a/addons/website/models/res_config.py
+++ b/addons/website/models/res_config.py
@@ -19,19 +19,14 @@ class website_config_settings(osv.osv_memory):
         'social_linkedin': fields.related('website_id', 'social_linkedin', type="char", string='LinkedIn Account'),
         'social_youtube': fields.related('website_id', 'social_youtube', type="char", string='Youtube Account'),
         'social_googleplus': fields.related('website_id', 'social_googleplus', type="char", string='Google+ Account'),
-
-        'module_website_sale': fields.boolean('E-Commerce', help='Sell Your Products Online'),
-        'module_website_blog': fields.boolean('Blog', help='News, Blogs, Announces, Discussions'),
-        'module_website_event': fields.boolean('Event', help='Schedule, Promote and Sell Events'),
-        'module_website_hr_recruitment': fields.boolean('Job Position', help='Promote Your Job Positions'),
     }
 
-    def on_change_website_id(self, cr, uid, ids, id, context=None):
-        website_data = self.pool.get('website').read(cr, uid, [id], [], context=context)[0]
+    def on_change_website_id(self, cr, uid, ids, website_id, context=None):
+        website_data = self.pool.get('website').read(cr, uid, [website_id], [], context=context)[0]
         values = {}
         for fname, v in website_data.items():
-            if self._columns.get(fname):
-                values[fname] = v and self._columns[fname]._type == 'many2one' and v[0] or v
+            if fname in self._columns:
+                values[fname] = v[0] if v and self._columns[fname]._type == 'many2one' else v
         return {'value' : values}
 
     _defaults = {

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 948e584..3f253e9 100644 (file)
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -423,7 +423,6 @@
                         menu.append('<li><a data-action="ace" href="#">HTML Editor</a></li>');
                         menu.append('<li class="js_change_theme"><a href="/page/website.themes">Change Theme</a></li>');
                         menu.append('<li><a href="/web#return_label=Website&action=website.action_module_website">Install Apps</a></li>');
-                        menu.append('<li><a href="/web#return_label=Website&action=website.action_website_configuration">Website Settings</a></li>');
                         self.trigger('rte:customize_menu_ready');
                     }
                 );

diff --git a/addons/website/views/res_config.xml b/addons/website/views/res_config.xml
index e0d55ab..96edb5a 100644 (file)
--- a/addons/website/views/res_config.xml
+++ b/addons/website/views/res_config.xml
@@ -80,43 +80,6 @@
                                 </div>
                             </div>
                         </group>
-                        <group string="Your Apps">
-                            <label for="module_website_sale"/>
-                            <div name="module_website_sale">
-                                <div>
-                                    <div name="module_website_sale" class="oe_inline">
-                                        <field name="module_website_sale"/>
-                                    </div>
-                                </div>
-                            </div>
-                            <label for="module_website_event"/>
-                            <div name="module_website_event">
-                                <div>
-                                    <div name="module_website_event" class="oe_inline">
-                                        <field name="module_website_event"/>
-                                    </div>
-                                </div>
-                            </div>
-                            <label for="module_website_blog"/>
-                            <div name="module_website_blog">
-                                <div>
-                                    <div name="module_website_blog" class="oe_inline">
-                                        <field name="module_website_blog"/>
-                                    </div>
-                                </div>
-                            </div>
-                            <label for="module_website_hr_recruitment"/>
-                            <div name="module_website_hr_recruitment">
-                                <div>
-                                    <div name="module_website_hr_recruitment" class="oe_inline">
-                                        <field name="module_website_hr_recruitment"/>
-                                    </div>
-                                </div>
-                            </div>
-                            <button type="action"
-                                    name="%(website.action_module_website)d"
-                                    string="All Your Website Apps" class="oe_link"/>
-                        </group>
                     </div>
                 </form>
             </field>