[MERGE] Forward port of saas-3 branch up to revid 9093 mat@openerp.com-20140203091848-9kspakimqorltvxx

bzr revid: mat@openerp.com-20140203095528-xo1u0vah94edmbub
2014-02-03 10:55:28 +01:00 · 2014-02-03 10:55:28 +01:00 · c25827f845
parent 4208281471 a9ea8c2275
commit c25827f845
6 changed files with 81 additions and 59 deletions
--- a/addons/gamification_sale_crm/sale_crm_goals_demo.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
@ -14,7 +14,7 @@
            <field name="user_id" eval="ref('base.user_demo')" />
            <field name="line_id" eval="ref('line_crm_sale1')" />
            <field name="start_date" eval="time.strftime('%Y-%m-01')" />
-            <field name="end_date" eval="time.strftime('%Y-%m-31')" />
+            <field name="end_date" eval="(DateTime.today().replace(day=1)+relativedelta(months=1, days=-1)).strftime('%Y-%m-%d')" />
            <field name="target_goal">2000</field>
            <field name="state">inprogress</field>
        </record>
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@ -17,7 +17,7 @@ website.EditorBar.include({
            var $menuItem = $($.parseHTML('<li><a href="#">'+tour.name+'</a></li>'));
            $menuItem.click(function () {
                tour.reset();
-                tour.trigger();
+                tour.run();
            });
            menu.append($menuItem);
        });
@ -100,20 +100,29 @@ website.Tour = openerp.Class.extend({
        this.registerSteps();
    },

-    run: function (automatic, force) {
-        if (force) this.reset();
+    run: function (automatic) {
+        this.reset();

        for (var k in this.localStorage) {
            if (!k.indexOf("tour-") && k.indexOf("-test") > -1) return;
        }

-        // only one test running
-        if (website.Tour.busy) return;
-
        website.Tour.busy = true;
-        this.localStorage.setItem("tour-"+this.id+"-test", 0);

-        website.Tour.waitReady.call(this, function () {this._run(automatic, force);});
+        if (automatic) {
+            this.localStorage.setItem("tour-"+this.id+"-test-automatic", true);
+        }
+
+        // redirect to begin of the tour
+        if (this.path) {
+            var path = this.path.split('?');
+            window.location.href = path[0] + "?tutorial."+this.id+"=true" + path.slice(1, path.length).join("?");
+            return;
+        }
+
+        var self = this;
+        this.localStorage.setItem("tour-"+this.id+"-test", 0);
+        website.Tour.waitReady.call(this, function () {self._running();});
    },
    running: function () {
        if (+this.localStorage.getItem("tour-"+this.id+"-test") >= this.steps.length) {
@ -121,33 +130,29 @@ website.Tour = openerp.Class.extend({
            return;
        }

-        if (website.Tour.busy || !this.testUrl()) return;
+        if (website.Tour.is_busy() || !this.testUrl()) return;
+
+        // launch tour with url
+        this.checkRunningUrl();
+
+        // mark tour as busy (only one test running)
+        if (this.localStorage.getItem("tour-"+this.id+"-test") != null) {
+            website.Tour.busy = true;
+        }

        var self = this;
-        website.Tour.waitReady.call(this, function () {
-            self._running();
-        }, 500);
+        website.Tour.waitReady.call(this, function () {self._running();});
    },

-    _run: function (automatic, force) {
-        this.reset();
-        this.localStorage.setItem("tour-"+this.id+"-test", 0);
-        if (automatic) {
-            this.localStorage.setItem("tour-"+this.id+"-test-automatic", true);
-        }
-        this.nextStep(null,  automatic ? this.autoNextStep : null, automatic ? 5000 : null);
-    },
    _running: function () {
        var stepId = this.localStorage.getItem("tour-"+this.id+"-test");
        var automatic = !!this.localStorage.getItem("tour-"+this.id+"-test-automatic");
        
-        if (stepId || this.checkRuningUrl()) {
-
+        if (stepId != null) {
            if (!this.check(this.step(stepId))) {
                var step = this.next(stepId);
                stepId = step ? step.stepId : stepId;
            }
-            website.Tour.busy = true;
            this.nextStep(stepId,  automatic ? this.autoNextStep : null, automatic ? 5000 : null);
        }
    },
@ -168,22 +173,15 @@ website.Tour = openerp.Class.extend({

        $('.popover.tour').remove();
    },
-    trigger: function (automatic) {
-        this.reset();
-        if (this.path) {
-            this.localStorage.setItem("tour-"+this.id+"-test", 0);
-            if (automatic) this.localStorage.setItem("tour-"+this.id+"-test-automatic", true);
-            var path = this.path.split('?');
-            window.location.href = path[0] + "?tutorial."+this.id+"=true" + path.slice(1, path.length).join("?");
-        } else {
-            this.run(automatic);
-        }
-    },
+
    testUrl: function () {
        return !this.testPath || this.testPath.test(window.location.href);
    },
-    checkRuningUrl: function () {
-        return window.location.search.indexOf("tutorial."+this.id+"=true") > -1;
+    checkRunningUrl: function () {
+        if (window.location.search.indexOf("tutorial."+this.id+"=true") > -1) {
+            this.localStorage.setItem("tour-"+this.id+"-test", 0);
+            window.location.href = window.location.href.replace(/tutorial.+=true&?/, '');
+        }
    },

    registerSteps: function () {
@ -430,7 +428,15 @@ website.Tour.waitReady = function (callback) {
    });
 };
 website.Tour.run_test = function (id) {
-    website.Tour.get(id).trigger(true);
+    website.Tour.get(id).run(true);
+};
+website.Tour.is_busy = function () {
+    for (var k in this.localStorage) {
+        if (!k.indexOf("tour-")) {
+            return true;
+        }
+    }
+    return website.Tour.busy;
 };


--- a/addons/website_blog/static/src/js/website.tour.blog.js
+++ b/addons/website_blog/static/src/js/website.tour.blog.js
@ -13,7 +13,7 @@
    website.BlogTour = website.Tour.extend({
        id: 'blog',
        name: "Create a blog post",
-        testPath: /\/blogpost\/[0-9]+\//,
+        testPath: /\/(blog|blogpost)\/[0-9]+\//,
        init: function (editor) {
            var self = this;
            self.steps = [
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-

+import werkzeug
+
 import openerp
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.tools.translate import _
 from openerp.addons.web.http import request
 from openerp.addons.website_partner.controllers import main as website_partner
-import werkzeug.urls

 class WebsiteCrmPartnerAssign(http.Controller):
    _references_per_page = 20
@ -14,16 +15,25 @@ class WebsiteCrmPartnerAssign(http.Controller):
    @http.route([
        '/partners/',
        '/partners/page/<int:page>/',
+
+        '/partners/grade/<int:grade_id>',
+        '/partners/grade/<int:grade_id>/page/<int:page>/',
+
        '/partners/country/<int:country_id>',
        '/partners/country/<country_name>-<int:country_id>',
        '/partners/country/<int:country_id>/page/<int:page>/',
        '/partners/country/<country_name>-<int:country_id>/page/<int:page>/',
+        
+        '/partners/grade/<int:grade_id>/country/<int:country_id>/',
+        '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>',
+        '/partners/grade/<int:grade_id>/country/<int:country_id>/page/<int:page>/',
+        '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>/page/<int:page>/',
+        
    ], type='http', auth="public", website=True, multilang=True)
-    def partners(self, country_id=0, page=0, **post):
+    def partners(self, country_id=0, grade_id=0, page=0, **post):
        country_obj = request.registry['res.country']
        partner_obj = request.registry['res.partner']
        post_name = post.get('search', '')
-        grade_id = post.get('grade', '')
        country = None

        # format displayed membership lines domain
@ -83,7 +93,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
            context=request.context, count=True)
        grades.insert(0, {
            'grade_id_count': grades_partners,
-            'grade_id': ("all", _("All Levels"))
+            'grade_id': (0, _("All Categories"))
        })

        values = {
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@ -35,13 +35,27 @@
                    Contact a reseller
                </h2>
            </div>
+
            <div class="col-md-4 mb32" id="partner_left">
-                <h3>Resellers by Country</h3>
+
                <ul class="nav nav-pills nav-stacked mt16">
+                    <li class="nav-header"><h3>Categories</h3></li>
+                    <t t-foreach="grades" t-as="grade">
+                        <li t-if="grade['grade_id']" t-att-class="grade['grade_id'][0] == grade_id and 'active' or ''">
+                            <a t-attf-href="#{ grade['grade_id'][0] and '/partners/grade/%s' % grade['grade_id'][0] or '/partners' }#{ current_country_id and ('/country/%s' % current_country_id) or '' }#{ search_path }">
+                                <span class="badge pull-right" t-esc="grade['grade_id_count'] or ''"/>
+                                <t t-esc="grade['grade_id'][1]"/> 
+                            </a>
+                        </li>
+                    </t>
+                </ul>
+
+                <ul id="reseller_countries" class="nav nav-pills nav-stacked mt16">
+                    <li class="nav-header"><h3>Locations</h3></li>
                    <t t-foreach="countries" t-as="country_dict">
                        <t t-if="country_dict['country_id']">
                            <li t-att-class="country_dict['country_id'][0] == current_country_id and 'active' or ''">
-                                <a t-attf-href="#{ country_dict['country_id'][0] and '/partners/country/%s' % slug(country_dict['country_id']) or '/partners/' }#{ search_path }">
+                                <a t-attf-href="#{ country_dict['country_id'][0] and ('/partners/country/%s' % slug(country_dict['country_id'])) or '/partners/' }#{ search_path }">
                                    <span class="badge pull-right" t-esc="country_dict['country_id_count'] or ''"/>
                                    <t t-esc="country_dict['country_id'][1]"/> 
                                </a>
@ -49,7 +63,9 @@
                        </t>
                    </t>
                </ul>
+
            </div>
+            
            <div class="col-md-8" id="ref_content">
                <div class='navbar'>
                    <div>
@ -60,17 +76,7 @@
                            <div class="form-group">
                                <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
                            </div>
-                            <div class="form-group">
-                                <select class="search-query col-md-2 mt4 form-control" name="grade" t-if="len(grades) > 1" onchange="submit()">
-                                    <t t-foreach="grades">
-                                        <t t-if="grade_id">
-                                            <option t-att-selected="searches.get('grade') == str(grade_id and grade_id[0]) and 'selected'" t-att-value="grade_id[0]">
-                                                <t t-esc="grade_id[1]"/> (<t t-esc="grade_id_count"/>)
-                                            </option>
-                                        </t>
-                                    </t>
-                                </select>
-                            </div>
+
                        </form>
                    </div>
                </div>
@ -103,7 +109,7 @@
 </template>

 <template id="ref_country" inherit_id="website_crm_partner_assign.index" inherit_option_id="website_crm_partner_assign.index" name="Left World Map">
-    <xpath expr="//div[@id='partner_left']//ul" position="after">
+    <xpath expr="//ul[@id='reseller_countries']" position="after">
        <h3>World Map</h3>
        <ul class="nav">
            <iframe t-attf-src="/google_map/?width=320&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners/"
--- a/addons/website_sale/static/description/index.html
+++ b/addons/website_sale/static/description/index.html
@ -27,7 +27,7 @@

 <section class="oe_container oe_dark">
    <div class="oe_row">
-        <h2 class="oe_slogan">Create Awsome Product Pages</h2>
+        <h2 class="oe_slogan">Create Awesome Product Pages</h2>
        <h3 class="oe_slogan">Get rid of old WYSIWYG editors</h3>
        <div class="oe_span6">
            <p class='oe_mt32'>
@ -295,7 +295,7 @@

 <section class="oe_container">
    <div class="oe_row">
-        <h2 class="oe_slogan">Fully Integrated With Others Apps</h2>
+        <h2 class="oe_slogan">Fully Integrated With Other Apps</h2>
        <h3 class="oe_slogan">Get hundreds of open source apps for free</h3>
        <div class="oe_span4">
            <a href="/apps/website">