Skip to content

Commit

Permalink
removed aq_parent from organType and updated RSS code
Browse files Browse the repository at this point in the history
  • Loading branch information
Roberto Diaz committed Nov 2, 2018
1 parent ec4b8f4 commit 9e3d75d
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 22 deletions.
2 changes: 1 addition & 1 deletion genweb/organs/browser/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ def canView(self):
if utils.isManager(self):
return True
estatSessio = utils.session_wf_state(self)
organ_tipus = self.context.aq_parent.organType
organ_tipus = self.context.organType

if organ_tipus == 'open_organ':
if estatSessio == 'planificada' and (utils.isSecretari(self) or utils.isEditor(self)):
Expand Down
4 changes: 2 additions & 2 deletions genweb/organs/browser/webservice.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def allAcords(self):
roles = api.user.get_roles(obj=element.aq_parent.aq_parent, username=username)
else:
roles = []
organ_tipus = element.aq_parent.aq_parent.organType
organ_tipus = element.organType
estatSessio = api.content.get_state(obj=element.aq_parent)
if organ_tipus == 'open_organ':
if estatSessio == 'planificada' and ('OG1-Secretari' in roles or 'OG2-Editor' in roles):
Expand Down Expand Up @@ -135,7 +135,7 @@ def allAcords(self):
roles = api.user.get_roles(obj=element.aq_parent.aq_parent.aq_parent, username=username)
else:
roles = []
organ_tipus = element.aq_parent.aq_parent.aq_parent.organType
organ_tipus = element.organType
estatSessio = api.content.get_state(obj=element.aq_parent.aq_parent)
if organ_tipus == 'open_organ':
if estatSessio == 'planificada' and ('OG1-Secretari' in roles or 'OG2-Editor' in roles):
Expand Down
2 changes: 1 addition & 1 deletion genweb/organs/content/acord.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def canView(self):
return True
estatSessio = utils.session_wf_state(self)

organ_tipus = self.context.organType # TODO: WHY??? Funciona amb 1 i 2 level up
organ_tipus = self.context.organType

if organ_tipus == 'open_organ':
if estatSessio == 'planificada' and (utils.isSecretari(self) or utils.isEditor(self)):
Expand Down
6 changes: 3 additions & 3 deletions genweb/organs/content/document.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def viewDocumentPublic(self):
"""
if utils.isManager(self):
return True
organ_tipus = self.context.aq_parent.organType # 1 level up
organ_tipus = self.context.organType
if self.context.defaultContent and self.context.alternateContent:
if organ_tipus == 'open_organ':
if utils.isMembre(self):
Expand Down Expand Up @@ -137,7 +137,7 @@ def viewDocumentReserved(self):
"""
if utils.isManager(self):
return True
organ_tipus = self.context.aq_parent.organType # 1 level up
organ_tipus = self.context.organType
if self.context.defaultContent and self.context.alternateContent:
if organ_tipus == 'open_organ':
if (utils.isSecretari(self) or utils.isEditor(self) or utils.isMembre(self)):
Expand Down Expand Up @@ -182,7 +182,7 @@ def canView(self):
if utils.isManager(self):
return True
estatSessio = utils.session_wf_state(self)
organ_tipus = self.context.aq_parent.organType # 1 level up
organ_tipus = self.context.organType
if organ_tipus == 'open_organ':
if estatSessio == 'planificada' and (utils.isSecretari(self) or utils.isEditor(self)):
return True
Expand Down
6 changes: 3 additions & 3 deletions genweb/organs/content/file.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def viewPublic(self):
"""
if utils.isManager(self):
return True
organ_tipus = self.context.aq_parent.organType # 1 level up
organ_tipus = self.context.organType
if self.context.visiblefile and self.context.hiddenfile:
if organ_tipus == 'open_organ':
if utils.isMembre(self):
Expand Down Expand Up @@ -210,7 +210,7 @@ def viewReserved(self):
"""
if utils.isManager(self):
return True
organ_tipus = self.context.aq_parent.organType # 1 level up
organ_tipus = self.context.organType
if self.context.visiblefile and self.context.hiddenfile:
if organ_tipus == 'open_organ':
if (utils.isSecretari(self) or utils.isEditor(self) or utils.isMembre(self)):
Expand Down Expand Up @@ -258,7 +258,7 @@ def canView(self):
if utils.isManager(self):
return True
estatSessio = utils.session_wf_state(self)
organ_tipus = self.context.aq_parent.organType # 1 level up
organ_tipus = self.context.organType
if organ_tipus == 'open_organ':
if estatSessio == 'planificada' and (utils.isSecretari(self) or utils.isEditor(self)):
return True
Expand Down
2 changes: 1 addition & 1 deletion genweb/organs/content/punt.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def canView(self):
return True
estatSessio = utils.session_wf_state(self)

organ_tipus = self.context.aq_parent.organType # 1 level up
organ_tipus = self.context.organType

if organ_tipus == 'open_organ':
if estatSessio == 'planificada' and (utils.isSecretari(self) or utils.isEditor(self)):
Expand Down
2 changes: 1 addition & 1 deletion genweb/organs/content/sessio.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ def canView(self):
if utils.isManager(self):
return True
estatSessio = utils.session_wf_state(self)
organ_tipus = self.context.aq_parent.organType # 1 level up
organ_tipus = self.context.organType

if organ_tipus == 'open_organ':
if estatSessio == 'planificada' and (utils.isSecretari(self) or utils.isEditor(self)):
Expand Down
2 changes: 1 addition & 1 deletion genweb/organs/content/subpunt.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ def canView(self):
if utils.isManager(self):
return True
estatSessio = utils.session_wf_state(self)
organ_tipus = self.context.aq_parent.aq_parent.organType # 2 levels up
organ_tipus = self.context.organType

if organ_tipus == 'open_organ':
if estatSessio == 'planificada' and (utils.isSecretari(self) or utils.isEditor(self)):
Expand Down
2 changes: 2 additions & 0 deletions genweb/organs/overrides.zcml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,6 @@
/>




</configure>
15 changes: 6 additions & 9 deletions genweb/organs/rss_custom.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from Products.ATContentTypes.interfaces.file import IFileContent
from plone.uuid.interfaces import IUUID
from zope.cachedescriptors.property import Lazy as lazy_property
from operator import itemgetter

# this might be a little silly but it's possible to not use
# Products.CMFPlone with dexterity content types
Expand Down Expand Up @@ -163,32 +164,28 @@ def _brains(self):
]:
add = False
tipus = item.portal_type
if tipus == 'genweb.organs.organgovern':
organ_tipus = item.getObject().organType
organ_tipus = item.organType
if tipus == 'genweb.organs.organsfolder':
add = True
elif tipus == 'genweb.organs.sessio' or tipus == 'genweb.organs.organgovern':
if organ_tipus == 'open_organ':
add = True
elif organ_tipus == 'restricted_to_members_organ':
if (utils.isSecretari(self) or utils.isEditor(self) or utils.isMembre(self)):
add = True
else:
add = False
elif organ_tipus == 'restricted_to_affected_organ':
if (utils.isSecretari(self) or utils.isEditor(self) or utils.isMembre(self) or utils.isAfectat(self)):
add = True
else:
add = False
else:
add = False
if tipus == 'genweb.organs.organsfolder':
add = True
else:
# Els elements tipics de Plone/Genweb es mostren al RSS
add = True

if add:
filtered_items.append(item)

return filtered_items
return sorted(filtered_items, key=itemgetter('start'), reverse=True)

def _items(self):
"""
Expand Down

0 comments on commit 9e3d75d

Please sign in to comment.