Merge pull request #91 from IMIO/PARAF-348/userid_hp_indexer

Removed userid hp indexer + SigningUsersCsv.filter_user

Author: sgeulette

imio/dms/mail/adapters.py

@@ -3,7 +3,6 @@
 from borg.localrole.interfaces import ILocalRoleProvider
 from collective.classification.folder.interfaces import IServiceInCharge
 from collective.classification.folder.interfaces import IServiceInCopy
-from collective.contact.core.content.held_position import IHeldPosition
 from collective.contact.core.content.organization import IOrganization
 from collective.contact.core.indexers import contact_source
 from collective.contact.core.interfaces import IContactContent
@@ -621,15 +620,6 @@ def mail_type_index(obj):
     return common_marker
 
 
-@indexer(IHeldPosition)
-def heldposition_userid_index(obj):
-    """Indexer of 'userid' for IHeldPosition. Stores parent userid !"""
-    parent = obj.aq_parent
-    if base_hasattr(parent, "userid") and parent.userid:
-        return parent.userid
-    return common_marker
-
-
 @indexer(ITaskContent)
 def task_enquirer_index(obj):
     """Indexer of 'mail_type' for ITaskContent. Stores enquirer !"""

imio/dms/mail/adapters.zcml

@@ -116,7 +116,6 @@
     <adapter name="labels" factory="imio.helpers.labels" />
     <adapter name="mail_date" factory=".adapters.mail_date_index" />
     <adapter name="mail_date" factory=".adapters.om_mail_date_index" />
-    <adapter name="userid" factory=".adapters.heldposition_userid_index" />
     <adapter name="mail_type" factory=".adapters.mail_type_index" />
     <adapter name="mail_type" factory=".adapters.task_enquirer_index" />
     <adapter name="markers" factory=".adapters.markers_im_index" />

imio/dms/mail/browser/configure.zcml

@@ -1068,15 +1068,6 @@
         />
     </configure>
 
-    <browser:page
-        name="signing-users-csv"
-        for="Products.CMFPlone.interfaces.IPloneSiteRoot"
-        class=".views.SigningUsersCsv"
-        permission="cmf.ManagePortal"
-        i18n:domain="imio.esign"
-        layer="imio.dms.mail.interfaces.IImioDmsMailLayer"
-    />
-
     <browser:page
         name="approvals"
         for="imio.dms.mail.dmsmail.IImioDmsOutgoingMail"

imio/dms/mail/browser/views.py

@@ -18,7 +18,6 @@
 from imio.esign import manage_session_perm
 from imio.esign.browser.views import ExternalSessionCreateView
 from imio.esign.browser.views import SessionsListingView
-from imio.esign.browser.views import SigningUsersCsv as BaseSigningUsersCsv
 from imio.esign.config import get_registry_enabled
 from imio.helpers.content import richtextval
 from imio.helpers.content import uuidToObject
@@ -35,7 +34,6 @@
 from Products.CMFPlone.browser.navigation import CatalogNavigationTabs
 from Products.CMFPlone.browser.navigation import get_id
 from Products.CMFPlone.browser.navigation import get_view_url
-from Products.CMFPlone.utils import base_hasattr
 from Products.CMFPlone.utils import safe_unicode
 from Products.Five import BrowserView
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
@@ -529,23 +527,6 @@ def may_create_external_sessions(self):
         return False
 
 
-class SigningUsersCsv(BaseSigningUsersCsv):
-
-    def filter_user(self, user_data):
-        """Filter users that are signers."""
-        hps = api.content.find(
-            portal_type="held_position",
-            userid=user_data["userid"],
-        )
-        if not hps:
-            return False
-        for hp in hps:
-            hp_obj = hp.getObject()
-            if base_hasattr(hp_obj, "usages") and "signer" in hp_obj.usages:
-                return True
-        return False
-
-
 class ApprovalTableView(BrowserView):
     """Main view for approvals table."""