Changeset 2534
- Timestamp:
- 07/30/07 06:43:44 (1 year ago)
- Files:
-
- discussionplugin/0.11/tracdiscussion/api.py (modified) (14 diffs)
- discussionplugin/0.11/tracdiscussion/core.py (modified) (1 diff)
- discussionplugin/0.11/tracdiscussion/htdocs/css/admin.css (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
discussionplugin/0.11/tracdiscussion/api.py
r2374 r2534 308 308 self.add_group(context, new_name, new_description) 309 309 310 # Redirect request to prevent re-submit. 311 context.req.redirect(context.req.href.discussion('redirect', 312 href = context.req.path_info)) 313 310 314 elif mode == 'group-post-edit': 311 315 context.req.perm.assert_permission('DISCUSSION_ADMIN') … … 319 323 self.edit_group(context, new_group, new_name, new_description) 320 324 325 # Redirect request to prevent re-submit. 326 context.req.redirect(context.req.href.discussion('redirect', 327 href = context.req.path_info)) 328 321 329 elif mode == 'group-delete': 322 330 context.req.perm.assert_permission('DISCUSSION_ADMIN') … … 334 342 for group_id in selection: 335 343 self.delete_group(context, int(group_id)) 344 345 # Redirect request to prevent re-submit. 346 context.req.redirect(context.req.href.discussion('redirect', 347 href = context.req.path_info)) 336 348 337 349 elif mode == 'forum-list': … … 397 409 new_description, new_moderators, new_group) 398 410 411 # Redirect request to prevent re-submit. 412 context.req.redirect(context.req.href.discussion('redirect', 413 href = context.req.path_info)) 414 399 415 elif mode == 'forum-post-edit': 400 416 context.req.perm.assert_permission('DISCUSSION_ADMIN') … … 416 432 new_description, new_moderators, new_group) 417 433 434 # Redirect request to prevent re-submit. 435 context.req.redirect(context.req.href.discussion('redirect', 436 href = context.req.path_info)) 437 418 438 elif mode == 'forum-delete': 419 439 context.req.perm.assert_permission('DISCUSSION_ADMIN') … … 421 441 # Delete forum 422 442 self.delete_forum(context, forum['id']) 443 444 # Redirect request to prevent re-submit. 445 context.req.redirect(context.req.href.discussion('redirect', 446 href = context.req.path_info)) 423 447 424 448 elif mode == 'forums-delete': … … 434 458 for forum_id in selection: 435 459 self.delete_forum(context, int(forum_id)) 460 461 # Redirect request to prevent re-submit. 462 context.req.redirect(context.req.href.discussion('redirect', 463 href = context.req.path_info)) 436 464 437 465 elif mode == 'topic-list': … … 498 526 notifier.notify(context, mode, forum, new_topic, None, to, cc) 499 527 528 # Redirect request to prevent re-submit. 529 context.req.redirect(context.req.href.discussion('redirect', 530 href = context.req.path_info)) 531 500 532 elif mode == 'topic-edit': 501 533 context.req.perm.assert_permission('DISCUSSION_APPEND') … … 524 556 topic['subject'], topic['body']) 525 557 558 # Redirect request to prevent re-submit. 559 context.req.redirect(context.req.href.discussion('redirect', 560 href = context.req.path_info)) 561 526 562 elif mode == 'topic-move': 527 563 context.req.perm.assert_permission('DISCUSSION_MODERATE') … … 543 579 self.set_forum(context, topic['id'], new_forum) 544 580 581 # Redirect request to prevent re-submit. 582 context.req.redirect(context.req.href.discussion('redirect', 583 href = context.req.path_info)) 584 545 585 elif mode == 'topic-delete': 546 586 context.req.perm.assert_permission('DISCUSSION_MODERATE') … … 550 590 # Delete topic. 551 591 self.delete_topic(context, topic['id']) 592 593 # Redirect request to prevent re-submit. 594 context.req.redirect(context.req.href.discussion('redirect', 595 href = context.req.path_info)) 552 596 553 597 elif mode == 'message-list': … … 593 637 notifier.notify(context, mode, forum, topic, new_message, to, cc) 594 638 639 # Redirect request to prevent re-submit. 640 if context.req.args.get('component') != 'wiki': 641 context.req.redirect(context.req.href.discussion('redirect', 642 href = context.req.path_info)) 643 595 644 elif mode == 'message-edit': 596 645 context.req.perm.assert_permission('DISCUSSION_APPEND') … … 616 665 message['topic'], message['replyto'], new_body) 617 666 667 # Redirect request to prevent re-submit. 668 if context.req.args.get('component') != 'wiki': 669 context.req.redirect(context.req.href.discussion('redirect', 670 href = context.req.path_info)) 671 618 672 elif mode == 'message-delete': 619 673 context.req.perm.assert_permission('DISCUSSION_MODERATE') … … 623 677 # Delete message. 624 678 self.delete_message(context, message['id']) 679 680 # Redirect request to prevent re-submit. 681 if context.req.args.get('component') != 'wiki': 682 context.req.redirect(context.req.href.discussion('redirect', 683 href = context.req.path_info)) 625 684 626 685 elif mode == 'message-set-display': discussionplugin/0.11/tracdiscussion/core.py
r2352 r2534 51 51 # IRequestHandler methods 52 52 def match_request(self, req): 53 match = re.match(r'''/discussion(?:/?$|/(\d+)(?:/?$|/(\d+))(?:/?$|/(\d+)))$''', 54 req.path_info) 55 if match: 56 forum = match.group(1) 57 topic = match.group(2) 58 message = match.group(3) 59 if forum: 60 req.args['forum'] = forum 61 if topic: 62 req.args['topic'] = topic 63 if message: 64 req.args['message'] = message 65 return match 53 if req.path_info == '/discussion/redirect': 54 #Â Proces redirection request. 55 req.redirect(req.href(req.args.get('href'))) 56 else: 57 # Prepare regular requests. 58 match = re.match(r'''/discussion(?:/?$|/(\d+)(?:/?$|/(\d+))(?:/?$|/(\d+)))$''', 59 req.path_info) 60 if match: 61 forum = match.group(1) 62 topic = match.group(2) 63 message = match.group(3) 64 if forum: 65 req.args['forum'] = forum 66 if topic: 67 req.args['topic'] = topic 68 if message: 69 req.args['message'] = message 70 return match 66 71 67 72 def process_request(self, req): discussionplugin/0.11/tracdiscussion/htdocs/css/admin.css
r1088 r2534 3 3 { 4 4 text-align: left; 5 }6 7 .listing tr > td8 {9 margin: 0em !important;10 padding: 0em !important;11 height: 100%;12 }13 14 .listing tr > td > a15 {16 display: block;17 height: 100%;18 padding: 0.2em;19 margin: 0em !important;20 border: none;21 5 } 22 6
