merge stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Thu, 17 Dec 2009 16:18:36 +0100
branchstable
changeset 4130 9560ff49b2db
parent 4129 887e3edc30c5 (current diff)
parent 4128 8aaa5c6b9d1f (diff)
child 4131 d8ca873142f4
merge
--- a/schemas/_regproc.postgres.sql	Thu Dec 17 16:17:57 2009 +0100
+++ b/schemas/_regproc.postgres.sql	Thu Dec 17 16:18:36 2009 +0100
@@ -5,10 +5,12 @@
 
 */
 
+DROP FUNCTION IF EXISTS comma_join (anyarray) CASCADE;
 CREATE FUNCTION comma_join (anyarray) RETURNS text AS $$
     SELECT array_to_string($1, ', ')
 $$ LANGUAGE SQL;;
 
+DROP AGGREGATE IF EXISTS group_concat (anyelement) CASCADE;
 CREATE AGGREGATE group_concat (
   basetype = anyelement,
   sfunc = array_append,
@@ -19,6 +21,7 @@
 
 
 
+DROP FUNCTION IF EXISTS limit_size (fulltext text, format text, maxsize integer);
 CREATE FUNCTION limit_size (fulltext text, format text, maxsize integer) RETURNS text AS $$
 DECLARE
     plaintext text;
@@ -39,7 +42,7 @@
 END
 $$ LANGUAGE plpgsql;;
 
-
+DROP FUNCTION IF EXISTS text_limit_size (fulltext text, maxsize integer);
 CREATE FUNCTION text_limit_size (fulltext text, maxsize integer) RETURNS text AS $$
 BEGIN
     RETURN limit_size(fulltext, 'text/plain', maxsize);
--- a/view.py	Thu Dec 17 16:17:57 2009 +0100
+++ b/view.py	Thu Dec 17 16:18:36 2009 +0100
@@ -464,7 +464,7 @@
     def build_update_js_call(self, cbname, msg):
         rql = self.rset.printable_rql()
         return "javascript:userCallbackThenUpdateUI('%s', '%s', %s, %s, '%s', '%s')" % (
-            cbname, self.__regid__, dumps(rql), dumps(msg),
+            cbname, self.id, dumps(rql), dumps(msg),
             self.__registry__, self.div_id())
 
     def build_reload_js_call(self, cbname, msg):