kallithea Changeset - 333b3e7c991f

Changeset - 333b3e7c991f

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 14 years ago 2011-11-12 11:20:50
marcin@python-works.com

Added email sending test site

3 files changed with 39 insertions and 6 deletions:

rhodecode/controllers/admin/settings.py

rhodecode/lib/celerylib/tasks.py

rhodecode/templates/admin/settings/settings.html

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -228,22 +228,22 @@ class SettingsController(BaseController) @@
         if setting_id == 'hooks':
             ui_key = request.POST.get('new_hook_ui_key')
             ui_value = request.POST.get('new_hook_ui_value')
             try:
                 if ui_value and ui_key:
                     RhodeCodeUi.create_or_update_hook(ui_key, ui_value)
                     h.flash(_('Added new hook'),
                             category='success')
                 # check for edits
                 update = False
                 _d = request.POST.dict_of_lists()
                 for k, v in zip(_d.get('hook_ui_key',[]), _d.get('hook_ui_value_new',[])):
+                for k, v in zip(_d.get('hook_ui_key', []), _d.get('hook_ui_value_new', [])):
                     RhodeCodeUi.create_or_update_hook(k, v)
                     update = True
                 if update:
                     h.flash(_('Updated hooks'), category='success')
@@ @@ -251,12 +251,22 @@ class SettingsController(BaseController) @@
                 log.error(traceback.format_exc())
                 h.flash(_('error occurred during hook creation'),
                         category='error')
             return redirect(url('admin_edit_setting', setting_id='hooks'))
         if setting_id == 'email':
             test_email = request.POST.get('test_email')
             test_email_subj = 'RhodeCode TestEmail'
             test_email_body = 'RhodeCode Email test'
             run_task(tasks.send_email, [test_email], test_email_subj,
                      test_email_body)
             h.flash(_('Email task created'), category='success')
         return redirect(url('admin_settings'))
     @HasPermissionAllDecorator('hg.admin')
     def delete(self, setting_id):
         """DELETE /admin/settings/setting_id: Delete an existing item"""
         # Forms posted to this method should contain a hidden field:
@@ @@ -265,14 +275,14 @@ class SettingsController(BaseController) @@
         #    h.form(url('admin_setting', setting_id=ID),
         #           method='delete')
         # url('admin_setting', setting_id=ID)
         if setting_id == 'hooks':
             hook_id = request.POST.get('hook_id')
             RhodeCodeUi.delete(hook_id)
     @HasPermissionAllDecorator('hg.admin')
     def show(self, setting_id, format='html'):
         """
         GET /admin/settings/setting_id: Show a specific item"""
         # url('admin_setting', setting_id=ID)

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -344,13 +344,13 @@ def send_email(recipients, subject, body @@
         log = logging.getLogger(__name__)
     email_config = config
     if not recipients:
         # if recipients are not defined we send to email_config + all admins
         admins = [u.email for u in User.query().filter(User.admin==True).all()]
+        admins = [u.email for u in User.query().filter(User.admin == True).all()]
         recipients = [email_config.get('email_to')] + admins
     mail_from = email_config.get('app_email_from')
     user = email_config.get('smtp_username')
     passwd = email_config.get('smtp_password')
     mail_server = email_config.get('smtp_server')
@@ @@ -358,13 +358,13 @@ def send_email(recipients, subject, body @@
     tls = str2bool(email_config.get('smtp_use_tls'))
     ssl = str2bool(email_config.get('smtp_use_ssl'))
     debug = str2bool(config.get('debug'))
     smtp_auth = email_config.get('smtp_auth')
     try:
         m = SmtpMailer(mail_from, user, passwd, mail_server,smtp_auth,
+        m = SmtpMailer(mail_from, user, passwd, mail_server, smtp_auth,
                        mail_port, ssl, tls, debug=debug)
         m.send(recipients, subject, body)
     except:
         log.error('Mail sending failed')
         log.error(traceback.format_exc())
         return False

rhodecode/templates/admin/settings/settings.html

➞

Show inline comments

@@ @@ -185,8 +185,31 @@ @@
         YAHOO.util.Event.onDOMReady(function(){
             YAHOO.util.Event.addListener('path_unlock','click',function(){
                 YAHOO.util.Dom.get('paths_root_path').removeAttribute('readonly');
             });
         });
     </script>
     <h3>${_('Test Email')}</h3>
     ${h.form(url('admin_setting', setting_id='email'),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
                 <div class="label">
                     <label for="test_email">${_('Email to')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('test_email',size=30)}
                 </div>
             </div>
             <div class="buttons">
             ${h.submit('send',_('Send'),class_="ui-button")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 </%def>

0 comments (0 inline, 0 general)