Skip to content

Commit

Permalink
Infográfico pode ser editado pela folder_contents. (#585)
Browse files Browse the repository at this point in the history
Corrige parcialmente #578
  • Loading branch information
idgserpro authored Jun 5, 2019
1 parent 055ef14 commit 8c7cd3a
Show file tree
Hide file tree
Showing 9 changed files with 82 additions and 4 deletions.
3 changes: 2 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ Changelog
2.1.2 (unreleased)
^^^^^^^^^^^^^^^^^^

- Nothing changed yet.
- 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>`_).
[idgserpro]


2.1.1 (2018-12-08)
Expand Down
2 changes: 1 addition & 1 deletion src/brasil/gov/portal/profiles/default/metadata.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<metadata>
<version>10906</version>
<version>10907</version>
<dependencies>
<dependency>profile-collective.js.jqueryui:default</dependency>
<dependency>profile-plone.app.contenttypes:default</dependency>
Expand Down
3 changes: 3 additions & 0 deletions src/brasil/gov/portal/profiles/default/propertiestool.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
<element value="OGG Audio File"/>
<element value="Topic"/>
</property>
<property name="typesUseViewActionInListings" type="lines" purge="false">
<element value="Infographic"/>
</property>
<property name="icon_visibility" type="string">authenticated</property>
</object>
<object name="brasil_gov" meta_type="Plone Property Sheet">
Expand Down
5 changes: 4 additions & 1 deletion src/brasil/gov/portal/setuphandlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
@implementer(BBB.INonInstallable) # BBB: Plone 4.3
@implementer(INonInstallable)
class NonInstallable(object): # pragma: no cover

@staticmethod
def getNonInstallableProducts():
"""Hide in the add-ons configlet."""
Expand All @@ -26,6 +25,8 @@ def getNonInstallableProducts():
u'brasil.gov.portal.upgrades.v10903',
u'brasil.gov.portal.upgrades.v10904',
u'brasil.gov.portal.upgrades.v10905',
u'brasil.gov.portal.upgrades.v10906',
u'brasil.gov.portal.upgrades.v10907',
u'brasil.gov.tiles.upgrades.v2000',
u'brasil.gov.vcge.at',
u'brasil.gov.vcge.dx',
Expand Down Expand Up @@ -83,6 +84,8 @@ def getNonInstallableProfiles():
u'brasil.gov.portal.upgrades.v10903:default',
u'brasil.gov.portal.upgrades.v10904:default',
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:default',
u'brasil.gov.portal:initcontent',
u'brasil.gov.portal:uninstall',
Expand Down
38 changes: 37 additions & 1 deletion src/brasil/gov/portal/tests/test_infographic.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@
from brasil.gov.portal.content.infographic import IInfographic
from brasil.gov.portal.testing import INTEGRATION_TESTING
from plone import api
from plone.app.testing import setRoles
from plone.app.testing import TEST_USER_ID
from plone.app.testing import TEST_USER_NAME
from plone.app.testing import TEST_USER_PASSWORD
from plone.dexterity.interfaces import IDexterityFTI
from plone.testing.z2 import Browser
from zope.component import createObject
from zope.component import queryUtility

import transaction
import unittest


Expand All @@ -15,11 +21,26 @@ class InfographicTestCase(unittest.TestCase):

def setUp(self):
self.portal = self.layer['portal']
self.browser = Browser(self.layer['app'])

def _create_infographic(self):
with api.env.adopt_roles(['Manager']):
self.infographic = api.content.create(
self.portal, 'Infographic', 'infographic')
self.portal, 'Infographic', 'infographic',
)

def _login_browser(self):
"""Autentica usuário de teste no browser"""
setRoles(self.portal, TEST_USER_ID, ['Site Administrator'])
self.browser.handleErrors = False
basic_auth = 'Basic {0}'.format(
'{0}:{1}'.format(TEST_USER_NAME, TEST_USER_PASSWORD),
)
self.browser.addHeader('Authorization', basic_auth)
transaction.commit()

def test_adding(self):
self._create_infographic()
self.assertTrue(IInfographic.providedBy(self.infographic))

def test_fti(self):
Expand All @@ -39,4 +60,19 @@ def test_factory(self):

def test_exclude_from_navigation_behavior(self):
from plone.app.dexterity.behaviors.exclfromnav import IExcludeFromNavigation

self._create_infographic()
self.assertTrue(IExcludeFromNavigation.providedBy(self.infographic))

def test_edit_link_folder_contents(self):
"""https://github.com/plonegovbr/brasil.gov.portal/issues/578"""
with api.env.adopt_roles(['Manager']):
api.content.create(self.portal, 'Infographic', 'infographic-XX')
# Necessário para poder visualizar os objetos criados nos testes
# unitários em self.browser.
transaction.commit()

self._login_browser()
self.browser.open(
'{0}/folder_contents'.format(self.portal.absolute_url()))
self.assertIn('infographic-XX/view', self.browser.contents)
1 change: 1 addition & 0 deletions src/brasil/gov/portal/upgrades/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
<include package=".v10904" />
<include package=".v10905" />
<include package=".v10906" />
<include package=".v10907" />
</configure>
1 change: 1 addition & 0 deletions src/brasil/gov/portal/upgrades/v10907/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# -*- coding: utf-8 -*-
25 changes: 25 additions & 0 deletions src/brasil/gov/portal/upgrades/v10907/configure.zcml
Original file line number Diff line number Diff line change
@@ -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 (v10907)"
directory="profile"
description='Configuration for version 10907'
provides="Products.GenericSetup.interfaces.EXTENSION"
/>

<genericsetup:upgradeSteps
source="10906"
destination="10907"
profile="brasil.gov.portal:default">

<genericsetup:upgradeDepends
title="Torna possivel editar um infografico em folder_contents."
import_profile="brasil.gov.portal.upgrades.v10907:default"
/>

</genericsetup:upgradeSteps>

</configure>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<object name="portal_properties" meta_type="Plone Properties Tool">
<object name="site_properties" meta_type="Plone Property Sheet">
<property name="typesUseViewActionInListings" type="lines" purge="false">
<element value="Infographic"/>
</property>
</object>
</object>

0 comments on commit 8c7cd3a

Please sign in to comment.