Show More
@@ -251,7 +251,7 b' def send_password_link(user_email):' | |||||
251 |
|
251 | |||
252 | log = get_logger(send_password_link) |
|
252 | log = get_logger(send_password_link) | |
253 | DBS = get_session() |
|
253 | DBS = get_session() | |
254 |
|
254 | |||
255 | try: |
|
255 | try: | |
256 | user = User.get_by_email(user_email) |
|
256 | user = User.get_by_email(user_email) | |
257 | if user: |
|
257 | if user: | |
@@ -281,7 +281,7 b' def reset_user_password(user_email):' | |||||
281 |
|
281 | |||
282 | log = get_logger(reset_user_password) |
|
282 | log = get_logger(reset_user_password) | |
283 | DBS = get_session() |
|
283 | DBS = get_session() | |
284 |
|
284 | |||
285 | try: |
|
285 | try: | |
286 | try: |
|
286 | try: | |
287 | user = User.get_by_email(user_email) |
|
287 | user = User.get_by_email(user_email) | |
@@ -325,7 +325,7 b' def send_email(recipients, subject, body' | |||||
325 | """ |
|
325 | """ | |
326 | log = get_logger(send_email) |
|
326 | log = get_logger(send_email) | |
327 | DBS = get_session() |
|
327 | DBS = get_session() | |
328 |
|
328 | |||
329 | email_config = config |
|
329 | email_config = config | |
330 | subject = "%s %s" % (email_config.get('email_prefix'), subject) |
|
330 | subject = "%s %s" % (email_config.get('email_prefix'), subject) | |
331 | if not recipients: |
|
331 | if not recipients: |
@@ -774,7 +774,7 b' def urlify_commit(text_, repository=None' | |||||
774 |
|
774 | |||
775 | # urlify changesets |
|
775 | # urlify changesets | |
776 | text_ = urlify_changesets(text_, repository) |
|
776 | text_ = urlify_changesets(text_, repository) | |
777 |
|
777 | |||
778 | def linkify_others(t,l): |
|
778 | def linkify_others(t,l): | |
779 | urls = re.compile(r'(\<a.*?\<\/a\>)',) |
|
779 | urls = re.compile(r'(\<a.*?\<\/a\>)',) | |
780 | links = [] |
|
780 | links = [] | |
@@ -782,8 +782,8 b' def urlify_commit(text_, repository=None' | |||||
782 | if not urls.match(e): |
|
782 | if not urls.match(e): | |
783 | links.append('<a class="message-link" href="%s">%s</a>' % (l,e)) |
|
783 | links.append('<a class="message-link" href="%s">%s</a>' % (l,e)) | |
784 | else: |
|
784 | else: | |
785 |
links.append(e) |
|
785 | links.append(e) | |
786 |
|
786 | |||
787 | return ''.join(links) |
|
787 | return ''.join(links) | |
788 | try: |
|
788 | try: | |
789 | conf = config['app_conf'] |
|
789 | conf = config['app_conf'] | |
@@ -817,12 +817,12 b' def urlify_commit(text_, repository=None' | |||||
817 | 'issue-prefix': ISSUE_PREFIX, |
|
817 | 'issue-prefix': ISSUE_PREFIX, | |
818 | 'serv': ISSUE_SERVER_LNK, |
|
818 | 'serv': ISSUE_SERVER_LNK, | |
819 | } |
|
819 | } | |
820 |
|
820 | |||
821 | newtext = URL_PAT.sub(url_func, text_) |
|
821 | newtext = URL_PAT.sub(url_func, text_) | |
822 |
|
822 | |||
823 | # wrap not links into final link => link_ |
|
823 | # wrap not links into final link => link_ | |
824 | newtext = linkify_others(newtext, link_) |
|
824 | newtext = linkify_others(newtext, link_) | |
825 |
|
825 | |||
826 | return literal(newtext) |
|
826 | return literal(newtext) | |
827 | except: |
|
827 | except: | |
828 | log.error(traceback.format_exc()) |
|
828 | log.error(traceback.format_exc()) |
@@ -85,7 +85,7 b'' | |||||
85 | <div class="input"> |
|
85 | <div class="input"> | |
86 | ${h.text('username',class_='focus',size=40)} |
|
86 | ${h.text('username',class_='focus',size=40)} | |
87 | </div> |
|
87 | </div> | |
88 |
|
88 | |||
89 | </div> |
|
89 | </div> | |
90 | <div class="field"> |
|
90 | <div class="field"> | |
91 | <div class="label"> |
|
91 | <div class="label"> | |
@@ -94,7 +94,7 b'' | |||||
94 | <div class="input"> |
|
94 | <div class="input"> | |
95 | ${h.password('password',class_='focus',size=40)} |
|
95 | ${h.password('password',class_='focus',size=40)} | |
96 | </div> |
|
96 | </div> | |
97 |
|
97 | |||
98 | </div> |
|
98 | </div> | |
99 | <div class="buttons"> |
|
99 | <div class="buttons"> | |
100 | <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div> |
|
100 | <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div> | |
@@ -124,7 +124,7 b'' | |||||
124 | </ol> |
|
124 | </ol> | |
125 | </div> |
|
125 | </div> | |
126 | %endif |
|
126 | %endif | |
127 | </div> |
|
127 | </div> | |
128 | </div> |
|
128 | </div> | |
129 | </%def> |
|
129 | </%def> | |
130 |
|
130 |
General Comments 0
You need to be logged in to leave comments.
Login now