Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup Code #159

Merged
merged 1 commit into from
Mar 25, 2022
Merged

Cleanup Code #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions src/collective/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,2 @@
# -*- coding: utf-8 -*-
__import__("pkg_resources").declare_namespace(__name__)


try:
from Products.CMFPlone.utils import get_top_request
except ImportError:
# to make geolocation compatible we will patch plone
from collective.collectionfilter.utils import get_top_request

import Products.CMFPlone.utils

Products.CMFPlone.utils.get_top_request = get_top_request
3 changes: 0 additions & 3 deletions src/collective/collectionfilter/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# -*- coding: utf-8 -*-
from plone.api import env
from zope.i18nmessageid import MessageFactory


_ = MessageFactory("collective.collectionfilter")

PLONE_VERSION = env.plone_version()
5 changes: 0 additions & 5 deletions src/collective/collectionfilter/baseviews.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
from Acquisition import aq_inner
from collective.collectionfilter import PLONE_VERSION
from collective.collectionfilter.filteritems import get_filter_items
from collective.collectionfilter.filteritems import ICollectionish
from collective.collectionfilter.interfaces import IGroupByCriteria
Expand Down Expand Up @@ -118,10 +117,6 @@ def content_selector(self):

@property
def ajax_load(self):
if PLONE_VERSION < "5.1":
# Due to bug in AJAX load pattern makes it hard to make it work in 5.0.x
return False

values = api.portal.get_registry_record("plone.patternoptions")
if "collectionfilter" in values:
filterOptions = json.loads(values["collectionfilter"])
Expand Down
6 changes: 0 additions & 6 deletions src/collective/collectionfilter/interfaces.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
from collective.collectionfilter import _
from collective.collectionfilter import PLONE_VERSION
from collective.collectionfilter import utils
from plone.api.portal import get_registry_record as getrec
from plone.app.z3cform.widget import RelatedItemsFieldWidget
Expand All @@ -26,11 +25,6 @@ def pattern_options():
"recentlyUsed": True,
"selectableTypes": utils.target_collection_types,
}
if PLONE_VERSION < "5.1":
del options["basePath"]
options["selectableTypes"] = [
"Collection",
]
return options


Expand Down