Changeset 935
- Timestamp:
- 06/21/06 01:02:09 (3 years ago)
- Files:
-
- tracblogplugin/0.10/blog/web_ui.py (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
tracblogplugin/0.10/blog/web_ui.py
r766 r935 91 91 used. 92 92 93 Because any wiki page can be a blog entry,it is suggested that one uses a 94 unique tag for any page that should appear in the blog, such as the tag: 95 'blog' (the default). 96 93 97 The following options can be specified: 94 98 … … 227 231 else: 228 232 blog = tags.get_tagged_names(tlist, operation='intersection') 233 macropage = req.args.get('page', None) 229 234 230 235 poststart, postend, default_times = self._get_time_range(req, **kwargs) … … 236 241 macro_bl = self.env.config.get('blog', 'macro_blacklist', '').split(',') 237 242 macro_bl = [name.strip() for name in macro_bl if name.strip()] 243 macro_bl.append('BlogShow') 238 244 239 245 num_posts = self._choose_value('num_posts', req, kwargs, convert=int) … … 242 248 postend = 0 243 249 for blog_entry in blog: 250 if blog_entry == macropage: 251 continue 244 252 page = WikiPage(self.env, version=1, name=blog_entry) 245 253 version, post_time, author, comment, ipnr = page.get_history( … … 253 261 or '%x %X' 254 262 timeStr = format_datetime(post_time, format=time_format) 255 text = self._trim_page(page.text, blog_entry) 263 post_size = self._choose_value('post_size', req, kwargs, int) 264 if not post_size: 265 post_size = int(self.env.config.get('blog', 'post_size', 266 1024)) 267 text = self._trim_page(page.text, blog_entry, post_size) 256 268 pagetags = [x for x in tags.get_name_tags(blog_entry) if x not in tlist] 257 269 tagtags = [] … … 512 524 return val 513 525 514 def _trim_page(self, text, page_name ):526 def _trim_page(self, text, page_name, post_size): 515 527 """Trim the page text to the {{{post_size}} in trac.ini 516 528 … … 520 532 521 533 """ 522 post_size = int(self.env.config.get('blog', 'post_size', 1024))523 534 tlines = [] 524 535 entry_size = 0
