From 7ca57713d5d5b7a37415202027cc411bf98b1337 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Sat, 11 Feb 2012 11:48:09 +0100
Subject: [PATCH] always call assignConcepts() on saving; some clean-ups...

---
 browser/action.py | 11 +----------
 browser/form.py   | 11 +++--------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/browser/action.py b/browser/action.py
index e7ab214..a964fe2 100644
--- a/browser/action.py
+++ b/browser/action.py
@@ -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
 #  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.
-
-$Id$
 """
 
 from urllib import urlencode
@@ -75,7 +73,6 @@ class DialogAction(Action):
 
     @Lazy
     def url(self):
-        #return '%s/%s' % (self.page.getUrlForTarget(self.view), self.viewName)
         if self.target is not None:
             url = self.page.getUrlForTarget(self.target)
         else:
@@ -96,9 +93,6 @@ class DialogAction(Action):
         if self.viewTitle:
             urlParams['view_title'] = self.viewTitle
         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:
             url = self.page.getUrlForTarget(self.target)
         else:
@@ -116,7 +110,6 @@ class DialogAction(Action):
 actions.register('info', 'object', DialogAction,
         description=_(u'Information about this object.'),
         viewName='object_info.html',
-        #dialogName='object_info',
         dialogName='',
         icon='cybertools.icons/info.png',
         cssClass='icon-action',
@@ -152,8 +145,6 @@ actions.register('create_concept', 'portlet', DialogAction,
         viewName='create_concept.html',
         dialogName='createConcept',
         qualifier='create_concept',
-        #typeToken='.loops/concepts/topic',
-        #fixedType=True,
         innerForm='inner_concept_form.html',
 )
 
diff --git a/browser/form.py b/browser/form.py
index f30b120..99ead4c 100644
--- a/browser/form.py
+++ b/browser/form.py
@@ -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
 #  it under the terms of the GNU General Public License as published by
@@ -18,8 +18,6 @@
 
 """
 Classes for form presentation and processing.
-
-$Id$
 """
 
 from zope import component, interface, schema
@@ -561,8 +559,8 @@ class EditObject(FormController, I18NView):
             if k.startswith('state.'):
                 stateKeys.append(k)
         self.collectAutoConcepts()
-        if self.old or self.selected:
-            self.assignConcepts(obj)
+        #if self.old or self.selected:
+        self.assignConcepts(obj)
         for k in stateKeys:
             self.updateState(k)
         notify(ObjectModifiedEvent(obj))
@@ -641,7 +639,6 @@ class EditObject(FormController, I18NView):
         form = self.request.form
         if form.get('version.create'):
             versionable = IVersionable(obj)
-            #level = int(form.get('version.level', 1))
             level = int(form.get('version.level', 0))
             version = versionable.createVersion(level)
             notify(ObjectCreatedEvent(version))
@@ -712,8 +709,6 @@ class EditConcept(EditObject):
         obj.deassignParent(concept, predicates)
 
     def update(self):
-        #self.object = self.view.virtualTargetObject
-        #self.object = self.view.item.context
         self.object = self.view.item.target
         formState = self.updateFields()
         self.view.formState = formState