kallithea Changeset - 460ad816820d

Changeset - 460ad816820d

Parent rev.

Child rev.

[Not reviewed]

celery

0 4 0

Marcin Kuzminski - 15 years ago 2010-09-20 22:47:20
marcin@python-works.com

fixed bug when new repo had no last commiter,
fixed bug when my_account updating information failed, by not uniq email address.

4 files changed with 16 insertions and 5 deletions:

pylons_app/controllers/admin/settings.py

pylons_app/lib/utils.py

pylons_app/model/forms.py

pylons_app/templates/summary/summary.html

0 comments (0 inline, 0 general)

pylons_app/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -251,34 +251,39 @@ class SettingsController(BaseController) @@
+        )
     def my_account_update(self):
         """PUT /_admin/my_account_update: Update an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="PUT" />
         # Or using helpers:
         #    h.form(url('admin_settings_my_account_update'),
         #           method='put')
         # url('admin_settings_my_account_update', id=ID)
         user_model = UserModel()
         uid = c.hg_app_user.user_id
         _form = UserForm(edit=True, old_data={'user_id':uid})()
         _form = UserForm(edit=True, old_data={'user_id':uid,
                                               'email':c.hg_app_user.email})()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
             user_model.update_my_account(uid, form_result)
             h.flash(_('Your account was updated succesfully'),
                     category='success')
         except formencode.Invalid as errors:
             #c.user = self.sa.query(User).get(c.hg_app_user.user_id)
             c.user = self.sa.query(User).get(c.hg_app_user.user_id)
             c.user_repos = []
             for repo in c.cached_repo_list.values():
                 if repo.dbrepo.user.username == c.user.username:
                     c.user_repos.append(repo)
             return htmlfill.render(
                 render('admin/users/user_edit_my_account.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('error occured during update of user %s') \
                     % form_result.get('username'), category='error')
         return redirect(url('my_account'))

pylons_app/lib/utils.py

➞

Show inline comments

@@ @@ -212,24 +212,25 @@ def invalidate_cache(name, *args): @@
     if name == 'cached_repo_list':
         from pylons_app.model.hg_model import _get_repos_cached
         region_invalidate(_get_repos_cached, None, *args)
     if name == 'full_changelog':
         from pylons_app.model.hg_model import _full_changelog_cached
         region_invalidate(_full_changelog_cached, None, *args)
 class EmptyChangeset(BaseChangeset):
     revision = -1
     message = ''
     author = ''
     @LazyProperty
     def raw_id(self):
         """
         Returns raw string identifing this changeset, useful for web
         representation.
         """
         return '0' * 12
 def repo2db_mapper(initial_repo_list, remove_obsolete=False):
     """
@@ @@ -420,13 +421,14 @@ OXDGKEud/R8efZUt\n @@
     #PART TWO make test repo
     if os.path.isdir('/tmp/vcs_test'):
         shutil.rmtree('/tmp/vcs_test')
     cur_dir = dn(dn(os.path.abspath(__file__)))
     tar = tarfile.open(jn(cur_dir,'tests',"vcs_test.tar.gz"))
     tar.extractall('/tmp')
     tar.close()
@@ \ No newline at end of file @@

pylons_app/model/forms.py

➞

Show inline comments

@@ @@ -200,37 +200,41 @@ class ValidPath(formencode.validators.Fa @@
     def to_python(self, value, state):
         isdir = os.path.isdir(value.replace('*', ''))
         if (value.endswith('/*') or value.endswith('/**')) and isdir:
             return value
         elif not isdir:
             msg = _('This is not a valid path')
         else:
             msg = _('You need to specify * or ** at the end of path (ie. /tmp/*)')
         raise formencode.Invalid(msg, value, state,
                                      error_dict={'paths_root_path':msg})
 class UniqSystemEmail(formencode.validators.FancyValidator):
 def UniqSystemEmail(old_data):
     class _UniqSystemEmail(formencode.validators.FancyValidator):
     def to_python(self, value, state):
             if old_data['email'] != value:
         sa = meta.Session
         try:
             user = sa.query(User).filter(User.email == value).scalar()
             if user:
                 raise formencode.Invalid(_("That e-mail address is already taken") ,
                                          value, state)
         finally:
             meta.Session.remove()
         return value
     return _UniqSystemEmail
 class ValidSystemEmail(formencode.validators.FancyValidator):
     def to_python(self, value, state):
         sa = meta.Session
         try:
             user = sa.query(User).filter(User.email == value).scalar()
             if  user is None:
                 raise formencode.Invalid(_("That e-mail address doesn't exist.") ,
                                          value, state)
         finally:
             meta.Session.remove()
         return value
@@ @@ -267,25 +271,25 @@ def UserForm(edit=False, old_data={}): @@
     class _UserForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         username = All(UnicodeString(strip=True, min=3, not_empty=True), ValidUsername(edit, old_data))
         if edit:
             new_password = All(UnicodeString(strip=True, min=3, not_empty=False), ValidPassword)
             admin = StringBoolean(if_missing=False)
         else:
             password = All(UnicodeString(strip=True, min=8, not_empty=True), ValidPassword)
         active = StringBoolean(if_missing=False)
         name = UnicodeString(strip=True, min=3, not_empty=True)
         lastname = UnicodeString(strip=True, min=3, not_empty=True)
         email = All(Email(not_empty=True), UniqSystemEmail())
+        email = All(Email(not_empty=True), UniqSystemEmail(old_data))
     return _UserForm
 RegisterForm = UserForm
 def PasswordResetForm():
     class _PasswordResetForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         email = All(ValidSystemEmail(), Email(not_empty=True))
     return _PasswordResetForm

pylons_app/templates/summary/summary.html

➞

Show inline comments

@@ @@ -68,25 +68,25 @@ E.onDOMReady(function(e){ @@
 			  		${_('Username')}: ${c.repo_info.dbrepo.user.username}<br/>
 			  		${_('Name')}: ${c.repo_info.dbrepo.user.name} ${c.repo_info.dbrepo.user.lastname}<br/>
 			  		${_('Email')}: <a href="mailto:${c.repo_info.dbrepo.user.email}">${c.repo_info.dbrepo.user.email}</a>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Last change')}:</label>
 			  </div>
 			  <div class="input-short">
 			      ${h.age(c.repo_info.last_change)} - ${h.rfc822date(c.repo_info.last_change)}
-			      ${_('by')} ${c.repo_info.get_changeset('tip').author}
+			      ${_('by')} ${h.get_changeset_safe(c.repo_info,'tip').author}
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Clone url')}:</label>
 			  </div>
 			  <div class="input-short">
 			      <input type="text" id="clone_url" readonly="readonly" value="hg clone ${c.clone_repo_url}" size="70"/>
 			  </div>
 			 </div>

0 comments (0 inline, 0 general)