Changeset 24

Timestamp:

02/10/12 14:41:21 (16 months ago)

Author:

matobaa

Message:

pass the page name

File:

• trunk/Snapshot/snapshot/query.py (modified) (2 diffs)

trunk/Snapshot/snapshot/query.py

@@ -21 +21 @@
         if filename != 'query.html':
             return stream
-        page = WikiPage(self.env, 'QueryResult') # TODO: good name for default
+        query_string = data['query'].to_string().replace("\n", "")
+        page_name = 'report_resource' in data and \
+            'report:%s' % data['report_resource'].id or query_string 
+        if 'page_name' in req.args:
+            page_name = req.args['page_name']
+            query_string += '&page_name=%s' % page_name
+        page = WikiPage(self.env, page_name)
         if 'WIKI_MODIFY' not in req.perm(page.resource):
             return stream
         cols = [header['name'] for header in data['headers']]
-        text = '= Snapshot of [%s the query] =\n' % data['query'].to_string().replace("\n", "")
+        text = '= Snapshot of [%s the query]: =\n' % query_string
         text += '{{{#!QueryResults(group=%s) \n' % data['query'].group
         text += '||= href =||= ' + ' =||= '.join(cols)
@@ -38 +44 @@
                       tag.input(name='action', value='edit', type='hidden'),
                       tag.input(name='text', value=text, type='hidden'),
-                      tag.input(name='page', value='QueryResult'))
+                      tag.input(name='page', value=page_name))
         return stream | Transformer('//div[@id="content"]/div[@class="buttons"]') \
             .append(tag.form(div, action='wiki'))