Changeset 672 for trunk/email2trac.py.in
- Timestamp:
- 10/19/15 12:42:25 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/email2trac.py.in
r671 r672 374 374 # e : email address that the user has set in the settings tab 375 375 # 376 users = [ (u,n,e) for (u, n, e) in self.env.get_known_users(self.db) 376 #users = [ (u,n,e) for (u, n, e) in self.env.get_known_users(self.db) 377 users = [ (u,n,e) for (u, n, e) in self.env.get_known_users() 377 378 if ( 378 379 (e and (e.lower() == self.email_addr.lower())) or … … 1005 1006 ## When is the change committed 1006 1007 # 1007 if self.VERSION < 0.11: 1008 when = int(time.time()) 1009 else: 1010 when = datetime.now(util.datefmt.utc) 1008 when = datetime.now(util.datefmt.utc) 1011 1009 1012 1010 try: … … 1030 1028 ## How many changes has this ticket 1031 1029 # 1032 grouped = TicketModule(self.env).grouped_changelog_entries(tkt, self.db) 1030 #grouped = TicketModule(self.env).grouped_changelog_entries(tkt, self.db) 1031 grouped = TicketModule(self.env).grouped_changelog_entries(tkt) 1033 1032 cnum = sum(1 for e in grouped) + 1 1034 1033 … … 1037 1036 # We must use the ticket workflow framework 1038 1037 # 1039 if self.parameters.email_triggers_workflow and (self.VERSION >= 0.11): 1040 1038 if self.parameters.email_triggers_workflow: 1041 1039 if not self.mail_workflow(tkt): 1042 1043 1040 if tkt['status'] in ['closed']: 1044 1041 tkt['status'] = 'reopened' 1045 1042 tkt['resolution'] = '' 1046 1047 ## Old pre 0.11 situation1048 #1049 elif self.parameters.email_triggers_workflow:1050 1051 self.logger.debug('\temail triggers workflow pre trac 0.11')1052 1053 if tkt['status'] in ['closed']:1054 tkt['status'] = 'reopened'1055 tkt['resolution'] = ''1056 1057 1043 else: 1058 1044 self.logger.debug('\temail triggers workflow disabled') … … 1305 1291 ## When is the change committed 1306 1292 # 1307 if self.VERSION < 0.11: 1308 when = int(time.time()) 1309 else: 1310 when = datetime.now(util.datefmt.utc) 1293 when = datetime.now(util.datefmt.utc) 1311 1294 1312 1295 if self.parameters.dry_run: … … 1345 1328 comment = '%s\n%s\n' %(comment, error_with_attachments) 1346 1329 1347 if self.parameters.email_triggers_workflow and (self.VERSION >= 0.11):1330 if self.parameters.email_triggers_workflow: 1348 1331 if self.mail_workflow(tkt): 1349 1332 changed = True … … 1778 1761 self.save_email_for_debug(m, self.parameters.project_name, True) 1779 1762 1780 if self.VERSION <= 0.11: 1781 self.db = self.env.get_db_cnx() 1782 else: 1783 self.db = self.env.get_read_db() 1763 self.db = self.env.get_read_db() 1784 1764 1785 1765 self.get_sender_info(m) … … 2458 2438 ) 2459 2439 2460 if self.VERSION in [ 0.10 ]: 2461 s = '\r\n{{{\r\n#!html\r\n<a\r\n href="mailto:%s">Reply to: %s\r\n</a>\r\n}}}\r\n' %(s, author) 2462 else: 2463 s = '[mailto:"%s" Reply to: %s]' %(s, author) 2440 s = '[mailto:"%s" Reply to: %s]' %(s, author) 2464 2441 2465 2442 self.logger.debug("\tmailto link %s" %s) … … 2513 2490 try: 2514 2491 2515 2516 ## create false {abs_}href properties, to trick Notify()2517 #2518 if self.VERSION in [0.10]:2519 self.env.abs_href = Href(self.get_config('project', 'url'))2520 self.env.href = Href(self.get_config('project', 'url'))2521 2522 2492 tn = Email2TracNotifyEmail(self.env) 2523 2493 … … 2552 2522 if self.parameters.alternate_notify_template: 2553 2523 2554 if self.VERSION >= 0.1 1:2524 if self.VERSION >= 0.12: 2555 2525 2556 2526 from trac.web.chrome import Chrome … … 2814 2784 2815 2785 try: 2816 if version == '0.10': 2817 from trac import attachment 2818 from trac.env import Environment 2819 from trac.ticket import Ticket 2820 from trac.web.href import Href 2821 from trac import util 2822 from trac.ticket.web_ui import TicketModule 2823 2824 # 2825 # return util.text.to_unicode(str) 2826 # 2827 # see http://projects.edgewall.com/trac/changeset/2799 2828 from trac.ticket.notification import TicketNotifyEmail 2829 from trac import config as trac_config 2830 from trac.core import TracError 2831 2832 elif version in ['0.11', '0.12', '0.13', '1.0', '1.1']: 2786 2787 if version in ['0.12', '0.13', '1.0', '1.1']: 2833 2788 from trac import attachment 2834 2789 from trac import config as trac_config
Note: See TracChangeset
for help on using the changeset viewer.