cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow assignment to type concepts

Browse source 
git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3629 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2009-11-15 11:37:23 +00:00
parent 68c5dbbc08
commit 13ec1efea7
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
browser/common.py
View file

@ -389,18 +389,21 @@ class BaseView(GenericView, I18NView):
general = [('loops:resource:*', 'Any Resource'), general = [('loops:resource:*', 'Any Resource'),
('loops:concept:*', 'Any Concept'),] ('loops:concept:*', 'Any Concept'),]
return util.KeywordVocabulary(general return util.KeywordVocabulary(general
+ self.listTypesForSearch(exclude=('system', 'hidden',)) + self.listTypesForSearch(exclude=('system', 'hidden',))
+ [('loops:*', 'Any')]) + [('loops:*', 'Any')])
def conceptTypesForSearch(self): def conceptTypesForSearch(self):
general = [('loops:concept:*', 'Any Concept'),] general = [('loops:concept:*', 'Any Concept'),]
return util.KeywordVocabulary(general return util.KeywordVocabulary(general
+ self.listTypesForSearch(('concept',), ('system', 'hidden',),)) + self.listTypesForSearch(('concept',),
('hidden',),))
#('system', 'hidden',),))
def resourceTypesForSearch(self): def resourceTypesForSearch(self):
general = [('loops:resource:*', 'Any Resource'),] general = [('loops:resource:*', 'Any Resource'),]
return util.KeywordVocabulary(general return util.KeywordVocabulary(general
+ self.listTypesForSearch(('resource',), ('system', 'hidden'),)) + self.listTypesForSearch(('resource',),
('system', 'hidden',),))
# options/settings # options/settings
@ -423,7 +426,7 @@ class BaseView(GenericView, I18NView):
@Lazy @Lazy
def useVersioning(self): def useVersioning(self):
if 'useVersioning' in self.loopsRoot.options: if self.globalOptions('useVersioning'):
return True return True
options = getattr(self.controller, 'options', None) options = getattr(self.controller, 'options', None)
if options: if options:

6
browser/form.py
View file

@ -317,9 +317,11 @@ class CreateObjectForm(ObjectForm):
def maybeAssignedAsParent(self, obj): def maybeAssignedAsParent(self, obj):
if not IConcept.providedBy(obj): if not IConcept.providedBy(obj):
return False return False
if obj.conceptType == self.loopsRoot.getConceptManager().getTypeConcept(): qualifiers = IType(obj).qualifiers
if (obj.conceptType == self.conceptManager.getTypeConcept()
and not 'assign' in qualifiers):
return False return False
if 'noassign' in IType(obj).qualifiers: if 'noassign' in qualifiers:
return False return False
adap = adapted(obj) adap = adapted(obj)
if 'noassign' in getattr(adap, 'options', []): if 'noassign' in getattr(adap, 'options', []):

2
search/README.txt
View file

@ -72,7 +72,7 @@ zcml in real life:
>>> t = searchView.conceptTypesForSearch() >>> t = searchView.conceptTypesForSearch()
>>> len(t) >>> len(t)
9 11
>>> t.getTermByToken('loops:concept:*').title >>> t.getTermByToken('loops:concept:*').title
'Any Concept' 'Any Concept'

2
search/browser.py
View file

@ -109,7 +109,7 @@ class Search(BaseView):
types = [types] types = [types]
for type in types: for type in types:
result = self.executeQuery(title=title or None, type=type, result = self.executeQuery(title=title or None, type=type,
exclude=('system',)) exclude=('hidden',))
for o in result: for o in result:
if o.getLoopsRoot() == self.loopsRoot: if o.getLoopsRoot() == self.loopsRoot:
adObj = adapted(o, self.languageInfo) adObj = adapted(o, self.languageInfo)