Merge d06d038 into 6c89e52

CHANGES.rst

@@ -4,6 +4,8 @@ Changelog
 2.1.2 (unreleased)
 ^^^^^^^^^^^^^^^^^^
 
+- Corrige mecanismo de busca ativa. (fecha `#237 <https://github.com/plonegovbr/brasil.gov.portal/issues/237>`_).
+  [rodfersou, agnogueira]
 - Permite edição do tipo "MPEG Audio File" e "OGG Audio File" através da aba "Conteúdo". (atende parcialmente `#587 <https://github.com/plonegovbr/brasil.gov.portal/issues/587>`_).
   [idgserpro]
 - Permite edição do tipo Infográfico através da aba "Conteúdo". (atende parcialmente `#578 <https://github.com/plonegovbr/brasil.gov.portal/issues/578>`_).

src/brasil/gov/portal/browser/busca/busca.py

@@ -5,6 +5,7 @@
 from plone.app.search.browser import Search as PloneSearch
 from six.moves.urllib.parse import urlencode
 from zope.component import queryUtility
+from zope.publisher.browser import BrowserView
 from zope.schema.interfaces import IVocabularyFactory
 
 
@@ -38,3 +39,15 @@ def rel(self):
         """Formata rel a ser utilizado no href de cada termo
         """
         return u'dc:subject foaf:primaryTopic'
+
+
+class RedirectSearch(BrowserView):
+    def __call__(self):
+        response = self.request.response
+        view = 'busca'
+        if self.request['PATH_INFO'].endswith('updated_search'):
+            view += '_atualizada'
+        response.redirect(
+            '@@{1}?{2}'.format(view, self.request['QUERY_STRING']),
+            status=301
+        )

src/brasil/gov/portal/browser/busca/configure.zcml

@@ -9,6 +9,22 @@
      layer="brasil.gov.portal.interfaces.IBrasilGov"
      />
 
+  <browser:page
+     name="search"
+     class=".busca.RedirectSearch"
+     permission="zope2.View"
+     for="*"
+     layer="brasil.gov.portal.interfaces.IBrasilGov"
+     />
+
+  <browser:page
+     name="updated_search"
+     class=".busca.RedirectSearch"
+     permission="zope2.View"
+     for="Products.CMFCore.interfaces.IFolderish"
+     layer="brasil.gov.portal.interfaces.IBrasilGov"
+     />
+
   <browser:page
      name="busca"
      class=".busca.Search"

src/brasil/gov/portal/browser/busca/searchbox.pt

@@ -17,6 +17,7 @@
 
     <form id="searchGadget_form"
           action="@@busca"
+          data-action="@@busca"
           tal:attributes="action string:${navigation_root_url}/@@busca;
                           id string:${search_input_id}_form;">
         <div class="close" tal:condition="expandable_header">+</div>
@@ -46,6 +47,8 @@
 
         </fieldset>
 
+        <div class="LSResult" id="LSResult"><div class="LSShadow" id="LSShadow"></div></div>
+
         <div class="search-suggestions" tal:condition="expandable_header">
             <div class="news"
                  tal:define="featured_news view/featured_news"

src/brasil/gov/portal/browser/viewlets/templates/topo.pt

@@ -1,3 +1,6 @@
 <div i18n:domain="brasil.gov.portal" class="voltar-topo">
-    <a i18n:translate="" href="#wrapper">Back to Top</a>
+    <a i18n:translate=""
+       tal:attributes="href python:context.absolute_url() + '#wrapper'">
+        Back to Top
+    </a>
 </div>

src/brasil/gov/portal/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>10907</version>
+  <version>10908</version>
   <dependencies>
     <dependency>profile-collective.js.jqueryui:default</dependency>
     <dependency>profile-plone.app.contenttypes:default</dependency>

src/brasil/gov/portal/profiles/default/propertiestool.xml

@@ -58,7 +58,7 @@
     <property name="localTimeFormat" type="string">%d/%m/%Y</property>
     <property name="localLongTimeFormat" type="string">%d/%m/%Y %Hh%M</property>
     <property name="enable_link_integrity_checks" type="boolean">True</property>
-    <property name="enable_livesearch" type="boolean">False</property>
+    <property name="enable_livesearch" type="boolean">True</property>
     <property name="default_language" type="boolean">pt-br</property>
     <property name="default_charset" type="boolean">utf-8</property>
     <property name="types_not_searched" type="lines" purge="False">

src/brasil/gov/portal/setuphandlers.py

@@ -27,6 +27,7 @@ def getNonInstallableProducts():
             u'brasil.gov.portal.upgrades.v10905',
             u'brasil.gov.portal.upgrades.v10906',
             u'brasil.gov.portal.upgrades.v10907',
+            u'brasil.gov.portal.upgrades.v10908',
             u'brasil.gov.tiles.upgrades.v2000',
             u'brasil.gov.vcge.at',
             u'brasil.gov.vcge.dx',
@@ -86,6 +87,7 @@ def getNonInstallableProfiles():
             u'brasil.gov.portal.upgrades.v10905:default',
             u'brasil.gov.portal.upgrades.v10906:default',
             u'brasil.gov.portal.upgrades.v10907:default',
+            u'brasil.gov.portal.upgrades.v10908:default',
             u'brasil.gov.portal:default',
             u'brasil.gov.portal:initcontent',
             u'brasil.gov.portal:uninstall',

src/brasil/gov/portal/tests/test_portal_properties.py

@@ -29,8 +29,8 @@ def test_localLongTimeFormat(self):
     def test_enable_link_integrity_checks_enabled(self):
         self.assertTrue(self.properties.enable_link_integrity_checks)
 
-    def test_livesearch_disabled(self):
-        self.assertFalse(self.properties.enable_livesearch)
+    def test_livesearch_enabled(self):
+        self.assertTrue(self.properties.enable_livesearch)
 
     def test_default_language(self):
         self.assertTrue(self.languages.use_combined_language_codes)

src/brasil/gov/portal/tests/test_upgrades.py

@@ -532,3 +532,31 @@ def test_fix_nitf_default_view(self):
         # execute upgrade step
         self._do_upgrade(step)
         self.assertEqual(nitf.default_view, 'view')
+
+
+class to10908TestCase(UpgradeBaseTestCase):
+
+    from_ = '10907'
+    to_ = '10908'
+
+    def test_profile_version(self):
+        version = self.setup.getLastVersionForProfile(self.profile_id)[0]
+        self.assertEqual(version, self.from_)
+
+    def test_registered_steps(self):
+        steps = len(self.setup.listUpgrades(self.profile_id)[0])
+        self.assertEqual(steps, 1)
+
+    def test_enable_livesearch(self):
+        title = u'Enable livesearch by default'
+        step = self._get_upgrade_step_by_title(title)
+        self.assertIsNotNone(step)
+
+        # simulate state on previous version
+        settings = api.portal.get_tool('portal_properties').site_properties
+        settings.enable_livesearch = False
+        self.assertEqual(settings.enable_livesearch, False)
+
+        # execute upgrade step
+        self._do_upgrade(step)
+        self.assertEqual(settings.enable_livesearch, True)

src/brasil/gov/portal/upgrades/configure.zcml

@@ -7,4 +7,5 @@
   <include package=".v10905" />
   <include package=".v10906" />
   <include package=".v10907" />
+  <include package=".v10908" />
 </configure>

src/brasil/gov/portal/upgrades/v10908/__init__.py

@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+from brasil.gov.portal.logger import logger
+from plone import api
+
+
+def enable_livesearch(setup_tool):
+    """Enable livesearch by default."""
+    settings = api.portal.get_tool('portal_properties').site_properties
+    if not settings.enable_livesearch:
+        settings.enable_livesearch = True
+        logger.info('Live search enabled.')

src/brasil/gov/portal/upgrades/v10908/configure.zcml

@@ -0,0 +1,25 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup">
+
+  <genericsetup:registerProfile
+      name="default"
+      title="brasil.gov.portal (v10908)"
+      directory="profile"
+      description='Configuration for version 10908'
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
+  <genericsetup:upgradeSteps
+      source="10907"
+      destination="10908"
+      profile="brasil.gov.portal:default">
+
+    <genericsetup:upgradeStep
+        title="Enable livesearch by default"
+        handler=".enable_livesearch"
+        />
+
+  </genericsetup:upgradeSteps>
+
+</configure>