Changeset 4725

Timestamp:

Nov 3, 2008, 4:34:34 PM (12 years ago)

Author:

Catalin BALAN

Message:

SectionEditPlugin: - Fixed paragraph title in edit mode.

File:

• sectioneditplugin/0.11/tracsectionedit/web_ui.py (modified) (3 diffs)

sectioneditplugin/0.11/tracsectionedit/web_ui.py

@@ -39 +39 @@
                 if len(section_text) > 0 and section_text[-1] != '\n':
                     section_text += '\n'
+                if len(req.args['section_pre']) > 0 and req.args['section_pre'][-1] != '\n':
+                    section_text = '\n' + section_text
                 req.args['section_text'] = req.args.get('text')
                 req.args['text'] = "%s%s%s"%(req.args.get('section_pre'), 
@@ -52 +54 @@
     # ITemplateStreamFilter methods
     def filter_stream(self, req, method, filename, stream, data):
-        if filename == 'wiki_edit.html' and 'section' in req.args:
+        if filename == 'wiki_edit.html' and 'section' in req.args and 'merge' not in req.args:
             if 'section_text' in req.args:
                 section_pre, section_text, section_post = req.args.get('section_pre'), req.args.get('section_text'), req.args.get('section_post')
             else:
                 section_pre, section_text, section_post = self._split_page_text(data['page'].text, req.args['section'])
+                section_text = ''.join(section_text)
             
             section_element = html.input(type='hidden', name='section', id='section', value=req.args.get('section'))
@@ -63 +66 @@
             
             section_html = html(section_element, pre_element, post_element)
-            stream = stream | Transformer('//textarea[@name="text"]').empty().append(''.join(section_text)).before(section_html)
-            stream = stream | Transformer('//div[@id="content"]//h1').append("/%s (section %s)"%(section_text[0].strip('= '), req.args['section']))
+            stream = stream | Transformer('//textarea[@name="text"]').empty().append(section_text).before(section_html)
+            stream = stream | Transformer('//div[@id="content"]//h1').append("/%s (section %s)"%(section_text[:section_text.find('\n')].strip(" = \r\n"), req.args['section']))
         return stream