merge
authorGraziella Toutoungis <graziella.toutoungis@logilab.fr>
Mon, 18 May 2009 11:01:13 +0200
changeset 29 8bc2fe8410dc
parent 28 cc33abbef3da (current diff)
parent 24 6ec35d406fc1 (diff)
child 30 b5610fa0b190
merge
entities.py
--- a/data/cubes.keyword.js	Fri May 15 11:46:54 2009 +0200
+++ b/data/cubes.keyword.js	Mon May 18 11:01:13 2009 +0200
@@ -13,7 +13,7 @@
 /* callback called when tag-edition is finished */
 function validateKeywords(kwform, kwlist) {
     var eid = kwform.eid;
-    d = async_remote_exec('add_keywords', eid, kwlist);
+    d = asyncRemoteExec('add_keywords', eid, kwlist);
     d.addCallback(function(msg) {
 	log('got message', msg);
  	reloadComponent('keywordsbar', 'Any X WHERE X eid '+eid, 'contentnavigation');
--- a/entities.py	Fri May 15 11:46:54 2009 +0200
+++ b/entities.py	Mon May 18 11:01:13 2009 +0200
@@ -18,7 +18,7 @@
 class Classification(AnyEntity):
     id = 'Classification'
     fetch_attrs, fetch_order = fetch_config(['name'])
-    
+
     def parent(self):
         """overriden from TreeMixIn"""
         return None
@@ -31,9 +31,6 @@
 class Keyword(TreeMixIn, AnyEntity):
     id = 'Keyword'
     fetch_attrs, fetch_order = fetch_config(['name'])
-
-
-    
     tree_attribute = 'subkeyword_of'
     
     @property
--- a/views.py	Fri May 15 11:46:54 2009 +0200
+++ b/views.py	Mon May 18 11:01:13 2009 +0200
@@ -20,6 +20,10 @@
 uicfg.primaryview_section.tag_object_of(('*', 'applied_to', '*'), 'hidden')
 uicfg.primaryview_section.tag_subject_of(('*', 'applied_to', '*'), 'hidden')
 
+uicfg.actionbox_appearsin_addmenu.tag_object_of(('Classification', 'included_in', 'Keyword'), True)
+uicfg.actionbox_appearsin_addmenu.tag_object_of(('Keyword', 'subkeyword_of', 'Keyword'), True)
+uicfg.autoform_section.tag_object_of(('Keyword', 'in_state', '*'), 'generated')
+
 # keyword views ###############################################################
 
 class KeywordPrimaryView(baseviews.PrimaryView):