11.0 Improvement for filters and product page description (OCA#14)

* [IMP] website_apps_store: remove author filter from shop * [FIX]apps_product_creator: fix the broken image path problem with github direct link * [FIX]rename method with proper name * [FIX] solve the problem for renaming function * [FIX] reoved the author test cases
Tecnativa · May 2, 2019 · afeb806 · afeb806
1 parent 0563c27
commit afeb806
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 43 deletions.
diff --git a/website_apps_store/static/src/js/website_apps_store_tour.js b/website_apps_store/static/src/js/website_apps_store_tour.js
@@ -45,23 +45,6 @@ var base = require("web_editor.base");
         ]
     );
 
-    Tour.register('select_author_search', {
-        name: "Select Author",
-        url: '/shop',
-        test: true,
-        wait_for: base.ready()
-        },[
-            {
-                content: "Shop",
-                trigger: ".dropdown_author_by a.dropdown-toggle"
-            },
-            {
-                content: "Select Author",
-                trigger: ".dropdown_author_by .dropdown-menu a:first",
-            },
-        ]
-    );
-
     Tour.register('select_category_search', {
         name: "Select Category",
         url: '/shop',

diff --git a/website_apps_store/tests/test_tour_website_apps_store.py b/website_apps_store/tests/test_tour_website_apps_store.py
@@ -39,14 +39,6 @@ def test_select_version_search_tour(self):
             login="admin"
         )
 
-    def test_select_author_search_tour(self):
-        self.phantom_js(
-            "/shop",
-            self.tour + ".run('select_author_search')",
-            self.tour + ".tours.select_author_search.ready",
-            login="admin"
-        )
-
     def test_select_category_search_tour(self):
         self.phantom_js(
             "/shop",

diff --git a/website_apps_store/views/templates.xml b/website_apps_store/views/templates.xml
@@ -28,6 +28,9 @@
                     <span class="caret"></span>
                 </a>
                 <ul class="dropdown-menu" role="menu">
+                    <li t-att-class="'active' if not version else None">
+                        <a t-att-href="keep('/shop', version='')">All</a>
+                    </li>
                     <t t-foreach="versions" t-as="v">
                         <li t-att-class="'active' if v.id == int(version or 0) else None">
                             <a t-att-href="keep('/shop', version=v.id)">
@@ -38,29 +41,11 @@
                 </ul>
             </div>
         </template>
-        <template id="author_display" name="Show Author by">
-            <div class="dropdown btn-group dropdown_author_by">
-                <a href="#" class="dropdown-toggle btn btn-default" data-toggle="dropdown">
-                    <span>Author</span>
-                    <span class="caret"></span>
-                </a>
-                <ul class="dropdown-menu" role="menu">
-                    <t t-foreach="authors" t-as="auth_id">
-                        <li t-att-class="'active' if auth_id.id == int(author or 0) else None">
-                            <a t-att-href="keep('/shop', author=auth_id.id)">
-                                <span t-esc="auth_id.name"/>
-                            </a>
-                        </li>
-                    </t>
-                </ul>
-            </div>
-        </template>
 
         <template id="sort_customize" inherit_id="website_sale.sort">
             <xpath expr='//div[hasclass("dropdown_sorty_by")]' position="after">
                 <t t-call="website_apps_store.category_display"/>
                 <t t-call="website_apps_store.version_display"/>
-                <t t-call="website_apps_store.author_display"/>
             </xpath>
         </template>