upstream/kallithea Commit - r2357:ea079c9b

merge with beta

marcink -

r2357:ea079c9b codereview

parent child

rhodecode/templates/admin/users/user_edit_my_account_form.html

0 created 644 +85 0

@@ -0,0 +1,85 b''
	1	<div>
	2	${h.form(url('admin_settings_my_account_update'),method='put')}
	3	<div class="form">
	4
	5	<div class="field">
	6	<div class="gravatar_box">
	7	<div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div>
	8	<p>
	9	%if c.use_gravatar:
	10	<strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong>
	11	<br/>${_('Using')} ${c.user.email}
	12	%else:
	13	<br/>${c.user.email}
	14	%endif
	15	</p>
	16	</div>
	17	</div>
	18	<div class="field">
	19	<div class="label">
	20	<label>${_('API key')}</label> ${c.user.api_key}
	21	</div>
	22	</div>
	23	<div class="fields">
	24	<div class="field">
	25	<div class="label">
	26	<label for="username">${_('Username')}:</label>
	27	</div>
	28	<div class="input">
	29	${h.text('username',class_="medium")}
	30	</div>
	31	</div>
	32
	33	<div class="field">
	34	<div class="label">
	35	<label for="new_password">${_('New password')}:</label>
	36	</div>
	37	<div class="input">
	38	${h.password('new_password',class_="medium",autocomplete="off")}
	39	</div>
	40	</div>
	41
	42	<div class="field">
	43	<div class="label">
	44	<label for="password_confirmation">${_('New password confirmation')}:</label>
	45	</div>
	46	<div class="input">
	47	${h.password('password_confirmation',class_="medium",autocomplete="off")}
	48	</div>
	49	</div>
	50
	51	<div class="field">
	52	<div class="label">
	53	<label for="name">${_('First Name')}:</label>
	54	</div>
	55	<div class="input">
	56	${h.text('name',class_="medium")}
	57	</div>
	58	</div>
	59
	60	<div class="field">
	61	<div class="label">
	62	<label for="lastname">${_('Last Name')}:</label>
	63	</div>
	64	<div class="input">
	65	${h.text('lastname',class_="medium")}
	66	</div>
	67	</div>
	68
	69	<div class="field">
	70	<div class="label">
	71	<label for="email">${_('Email')}:</label>
	72	</div>
	73	<div class="input">
	74	${h.text('email',class_="medium")}
	75	</div>
	76	</div>
	77
	78	<div class="buttons">
	79	${h.submit('save',_('Save'),class_="ui-button")}
	80	${h.reset('reset',_('Reset'),class_="ui-button")}
	81	</div>
	82	</div>
	83	</div>
	84	${h.end_form()}
	85	</div> No newline at end of file

docs/installation.rst

0 +1 -1

                 pip install rhodecode
             If you prefer to install RhodeCode manually simply grab latest release from
-            http://pypi.python.org/pypi/rhodecode, decompress the archive and run::
+            http://pypi.python.org/pypi/RhodeCode, decompress the archive and run::
                 python setup.py install

rhodecode/controllers/admin/settings.py

0 +7 -4

                         return redirect(url('users'))
                     defaults = c.user.get_dict()
-                    return htmlfill.render(
-                        render('admin/users/user_edit_my_account.html'),
+                    c.form = htmlfill.render(
+                        render('admin/users/user_edit_my_account_form.html'),
                         defaults=defaults,
                         encoding="UTF-8",
                         force_defaults=False
                     )
+                    return render('admin/users/user_edit_my_account.html')
                 def my_account_update(self):
                     """PUT /_admin/my_account_update: Update an existing item"""
                             .all()
                         c.user_repos = ScmModel().get_repos(all_repos)
-                        return htmlfill.render(
+                        c.form = htmlfill.render(
-                            render('admin/users/user_edit_my_account.html'),
+                            render('admin/users/user_edit_my_account_form.html'),
                             defaults=errors.value,
                             errors=errors.error_dict or {},
                             prefix_error=False,
                             encoding="UTF-8")
+                        return render('admin/users/user_edit_my_account.html')
                     except Exception:
                         log.error(traceback.format_exc())
                         h.flash(_('error occurred during update of user %s') \

rhodecode/model/db.py

0 +54 -7

             import logging
             import datetime
             import traceback
+            import hashlib
             from collections import defaultdict
             from sqlalchemy import *
             from sqlalchemy.ext.hybrid import hybrid_property
             from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
+            from sqlalchemy.exc import DatabaseError
             from beaker.cache import cache_region, region_invalidate
             from pylons.i18n.translation import lazy_ugettext as _
             from rhodecode.lib.caching_query import FromCache
             from rhodecode.model.meta import Base, Session
-            import hashlib
-            from sqlalchemy.exc import DatabaseError
             URL_SEP = '/'
             log = logging.getLogger(__name__)
                         return safe_str(self.__unicode__())
                     return '<DB:%s>' % (self.__class__.__name__)
             class RhodeCodeSetting(Base, BaseModel):
                 __tablename__ = 'rhodecode_settings'
                 __table_args__ = (
                 def scm_instance(self):
                     return self.__get_instance()
-                @property
+                def scm_instance_cached(self, cache_map=None):
-                def scm_instance_cached(self):
                     @cache_region('long_term')
                     def _c(repo_name):
                         return self.__get_instance()
                     rn = self.repo_name
                     log.debug('Getting cached instance of repo')
-                    inv = self.invalidate
-                    if inv is not None:
+                    if cache_map:
+                        # get using prefilled cache_map
+                        invalidate_repo = cache_map[self.repo_name]
+                        if invalidate_repo:
+                            invalidate_repo = (None if invalidate_repo.cache_active
+                                               else invalidate_repo)
+                    else:
+                        # get from invalidate
+                        invalidate_repo = self.invalidate
+                    if invalidate_repo is not None:
                         region_invalidate(_c, None, rn)
                         # update our cache
-                        CacheInvalidation.set_valid(inv.cache_key)
+                        CacheInvalidation.set_valid(invalidate_repo.cache_key)
                     return _c(rn)
                 def __get_instance(self):
                 __tablename__ = 'cache_invalidation'
                 __table_args__ = (
                     UniqueConstraint('cache_key'),
+                    Index('key_idx', 'cache_key'),
                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
                      'mysql_charset': 'utf8'},
                 )
                 def __unicode__(self):
                     return u"<%s('%s:%s')>" % (self.__class__.__name__,
                                               self.cache_id, self.cache_key)
                 @classmethod
                 def clear_cache(cls):
                     cls.query().delete()
                     Session.add(inv_obj)
                     Session.commit()
+                @classmethod
+                def get_cache_map(cls):
+                    class cachemapdict(dict):
+                        def __init__(self, *args, **kwargs):
+                            fixkey = kwargs.get('fixkey')
+                            if fixkey:
+                                del kwargs['fixkey']
+                            self.fixkey = fixkey
+                            super(cachemapdict, self).__init__(*args, **kwargs)
+                        def __getattr__(self, name):
+                            key = name
+                            if self.fixkey:
+                                key, _prefix, _org_key = cls._get_key(key)
+                            if key in self.__dict__:
+                                return self.__dict__[key]
+                            else:
+                                return self[key]
+                        def __getitem__(self, key):
+                            if self.fixkey:
+                                key, _prefix, _org_key = cls._get_key(key)
+                            try:
+                                return super(cachemapdict, self).__getitem__(key)
+                            except KeyError:
+                                return
+                    cache_map = cachemapdict(fixkey=True)
+                    for obj in cls.query().all():
+                        cache_map[obj.cache_key] = cachemapdict(obj.get_dict())
+                    return cache_map
             class ChangesetComment(Base, BaseModel):
                 __tablename__ = 'changeset_comments'

rhodecode/model/scm.py

0 +8 -2

             import logging
             import cStringIO
+            from sqlalchemy import func
             from rhodecode.lib.vcs import get_backend
             from rhodecode.lib.vcs.exceptions import RepositoryError
             from rhodecode.lib.vcs.utils.lazy import LazyProperty
                     return '<%s (%s)>' % (self.__class__.__name__, self.__len__())
                 def __iter__(self):
+                    # pre-propagated cache_map to save executing select statements
+                    # for each repo
+                    cache_map = CacheInvalidation.get_cache_map()
                     for dbr in self.db_repo_list:
-                        scmr = dbr.scm_instance_cached
+                        scmr = dbr.scm_instance_cached(cache_map)
                         # check permission at this level
                         if not HasRepoPermissionAny(
                             'repository.read', 'repository.write', 'repository.admin'
                     if all_repos is None:
                         all_repos = self.sa.query(Repository)\
                                     .filter(Repository.group_id == None)\
-                                    .order_by(Repository.repo_name).all()
+                                    .order_by(func.lower(Repository.repo_name)).all()
                     repo_iter = CachedRepoList(all_repos, repos_path=self.repos_path,
                                                order_by=sort_key)

rhodecode/templates/admin/users/user_edit_my_account.html

0 +1 -85

@@ -21,91 +21,7 b''
21	${self.breadcrumbs()}	21	${self.breadcrumbs()}
22	</div>	22	</div>
23	<!-- end box / title -->	23	<!-- end box / title -->
24	<div>	24	${c.form\|n}
25	${h.form(url('admin_settings_my_account_update'),method='put')}
26	<div class="form">
27
28	<div class="field">
29	<div class="gravatar_box">
30	<div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div>
31	<p>
32	%if c.use_gravatar:
33	<strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong>
34	<br/>${_('Using')} ${c.user.email}
35	%else:
36	<br/>${c.user.email}
37	%endif
38	</p>
39	</div>
40	</div>
41	<div class="field">
42	<div class="label">
43	<label>${_('API key')}</label> ${c.user.api_key}
44	</div>
45	</div>
46	<div class="fields">
47	<div class="field">
48	<div class="label">
49	<label for="username">${_('Username')}:</label>
50	</div>
51	<div class="input">
52	${h.text('username',class_="medium")}
53	</div>
54	</div>
55
56	<div class="field">
57	<div class="label">
58	<label for="new_password">${_('New password')}:</label>
59	</div>
60	<div class="input">
61	${h.password('new_password',class_="medium",autocomplete="off")}
62	</div>
63	</div>
64
65	<div class="field">
66	<div class="label">
67	<label for="password_confirmation">${_('New password confirmation')}:</label>
68	</div>
69	<div class="input">
70	${h.password('password_confirmation',class_="medium",autocomplete="off")}
71	</div>
72	</div>
73
74	<div class="field">
75	<div class="label">
76	<label for="name">${_('First Name')}:</label>
77	</div>
78	<div class="input">
79	${h.text('name',class_="medium")}
80	</div>
81	</div>
82
83	<div class="field">
84	<div class="label">
85	<label for="lastname">${_('Last Name')}:</label>
86	</div>
87	<div class="input">
88	${h.text('lastname',class_="medium")}
89	</div>
90	</div>
91
92	<div class="field">
93	<div class="label">
94	<label for="email">${_('Email')}:</label>
95	</div>
96	<div class="input">
97	${h.text('email',class_="medium")}
98	</div>
99	</div>
100
101	<div class="buttons">
102	${h.submit('save',_('Save'),class_="ui-button")}
103	${h.reset('reset',_('Reset'),class_="ui-button")}
104	</div>
105	</div>
106	</div>
107	${h.end_form()}
108	</div>
109	</div>	25	</div>
110		26
111	<div class="box box-right">	27	<div class="box box-right">

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages