--- a/web/views/tableview.py Thu Jul 08 12:54:28 2010 +0200
+++ b/web/views/tableview.py Thu Jul 08 13:33:40 2010 +0200
@@ -16,17 +16,13 @@
# You should have received a copy of the GNU Lesser General Public License along
# with CubicWeb. If not, see <http://www.gnu.org/licenses/>.
"""generic table view, including filtering abilities"""
+
__docformat__ = "restructuredtext en"
-try:
- from json import dumps
-except ImportError:
- from simplejson import dumps
-
from logilab.mtconverter import xml_escape
from cubicweb.selectors import nonempty_rset, match_form_params
-from cubicweb.utils import make_uid
+from cubicweb.utils import make_uid, json_dumps
from cubicweb.view import EntityView, AnyRsetView
from cubicweb import tags
from cubicweb.uilib import toggle_action, limitsize, htmlescape
@@ -77,7 +73,7 @@
# drop False / None values from vidargs
vidargs = dict((k, v) for k, v in vidargs.iteritems() if v)
w(u'<form method="post" cubicweb:facetargs="%s" action="">' %
- xml_escape(dumps([divid, self.__regid__, False, vidargs])))
+ xml_escape(json_dumps([divid, self.__regid__, False, vidargs])))
w(u'<fieldset id="%sForm" class="%s">' % (divid, hidden and 'hidden' or ''))
w(u'<input type="hidden" name="divid" value="%s" />' % divid)
w(u'<input type="hidden" name="fromformfilter" value="1" />')
@@ -197,7 +193,8 @@
rql = params.pop('rql', self.cw_rset.printable_rql())
# latest 'true' used for 'swap' mode
return 'javascript: replacePageChunk(%s, %s, %s, %s, true)' % (
- dumps(divid), dumps(rql), dumps(self.__regid__), dumps(params))
+ json_dumps(divid), json_dumps(rql), json_dumps(self.__regid__),
+ json_dumps(params))
def show_hide_actions(self, divid, currentlydisplayed=False):
showhide = u';'.join(toggle_action('%s%s' % (divid, what))[11:]