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

always call assignConcepts() on saving; some clean-ups...

Browse source
This commit is contained in:
Helmut Merz 2012-02-11 11:48:09 +01:00
parent 0a6ba7bab1
commit 7ca57713d5
2 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
browser/action.py
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2009 Helmut Merz helmutm@cy55.de # Copyright (c) 2012 Helmut Merz helmutm@cy55.de
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -18,8 +18,6 @@
""" """
Base classes (sort of views) for action portlet items. Base classes (sort of views) for action portlet items.
$Id$
""" """
from urllib import urlencode from urllib import urlencode
@ -75,7 +73,6 @@ class DialogAction(Action):
@Lazy @Lazy
def url(self): def url(self):
#return '%s/%s' % (self.page.getUrlForTarget(self.view), self.viewName)
if self.target is not None: if self.target is not None:
url = self.page.getUrlForTarget(self.target) url = self.page.getUrlForTarget(self.target)
else: else:
@ -96,9 +93,6 @@ class DialogAction(Action):
if self.viewTitle: if self.viewTitle:
urlParams['view_title'] = self.viewTitle urlParams['view_title'] = self.viewTitle
urlParams.update(self.addParams) urlParams.update(self.addParams)
#url = self.page.getUrlForTarget(self.view)
#return self.jsOnClick % (self.dialogName, url, self.viewName,
# urlencode(urlParams))
if self.target is not None: if self.target is not None:
url = self.page.getUrlForTarget(self.target) url = self.page.getUrlForTarget(self.target)
else: else:
@ -116,7 +110,6 @@ class DialogAction(Action):
actions.register('info', 'object', DialogAction, actions.register('info', 'object', DialogAction,
description=_(u'Information about this object.'), description=_(u'Information about this object.'),
viewName='object_info.html', viewName='object_info.html',
#dialogName='object_info',
dialogName='', dialogName='',
icon='cybertools.icons/info.png', icon='cybertools.icons/info.png',
cssClass='icon-action', cssClass='icon-action',
@ -152,8 +145,6 @@ actions.register('create_concept', 'portlet', DialogAction,
viewName='create_concept.html', viewName='create_concept.html',
dialogName='createConcept', dialogName='createConcept',
qualifier='create_concept', qualifier='create_concept',
#typeToken='.loops/concepts/topic',
#fixedType=True,
innerForm='inner_concept_form.html', innerForm='inner_concept_form.html',
) )

11
browser/form.py
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2010 Helmut Merz helmutm@cy55.de # Copyright (c) 2012 Helmut Merz helmutm@cy55.de
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -18,8 +18,6 @@
""" """
Classes for form presentation and processing. Classes for form presentation and processing.
$Id$
""" """
from zope import component, interface, schema from zope import component, interface, schema
@ -561,8 +559,8 @@ class EditObject(FormController, I18NView):
if k.startswith('state.'): if k.startswith('state.'):
stateKeys.append(k) stateKeys.append(k)
self.collectAutoConcepts() self.collectAutoConcepts()
if self.old or self.selected: #if self.old or self.selected:
self.assignConcepts(obj) self.assignConcepts(obj)
for k in stateKeys: for k in stateKeys:
self.updateState(k) self.updateState(k)
notify(ObjectModifiedEvent(obj)) notify(ObjectModifiedEvent(obj))
@ -641,7 +639,6 @@ class EditObject(FormController, I18NView):
form = self.request.form form = self.request.form
if form.get('version.create'): if form.get('version.create'):
versionable = IVersionable(obj) versionable = IVersionable(obj)
#level = int(form.get('version.level', 1))
level = int(form.get('version.level', 0)) level = int(form.get('version.level', 0))
version = versionable.createVersion(level) version = versionable.createVersion(level)
notify(ObjectCreatedEvent(version)) notify(ObjectCreatedEvent(version))
@ -712,8 +709,6 @@ class EditConcept(EditObject):
obj.deassignParent(concept, predicates) obj.deassignParent(concept, predicates)
def update(self): def update(self):
#self.object = self.view.virtualTargetObject
#self.object = self.view.item.context
self.object = self.view.item.target self.object = self.view.item.target
formState = self.updateFields() formState = self.updateFields()
self.view.formState = formState self.view.formState = formState