kallithea Changeset - f3f847712f87

Changeset - f3f847712f87

Parent rev.

Child rev.

[Not reviewed]

beta

0 6 0

Marcin Kuzminski - 15 years ago 2011-03-09 20:26:02
marcin@python-works.com

replaced all global calls to template context (rhodecode_user), into instance attributes

6 files changed with 13 insertions and 13 deletions:

rhodecode/controllers/admin/repos.py

rhodecode/controllers/admin/settings.py

rhodecode/controllers/journal.py

rhodecode/controllers/login.py

rhodecode/controllers/settings.py

rhodecode/controllers/summary.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -155,13 +155,13 @@ class ReposController(BaseController): @@
         repo_model = RepoModel()
         c.repo_groups = [('', '')]
         c.repo_groups.extend([(x.group_id, x.group_name) for x in self.sa.query(Group).all()])
         form_result = {}
         try:
             form_result = RepoForm()(repo_groups=c.repo_groups).to_python(dict(request.POST))
-            repo_model.create(form_result, c.rhodecode_user)
+            repo_model.create(form_result, self.rhodecode_user)
             if form_result['clone_uri']:
                 h.flash(_('created repository %s from %s') \
                     % (form_result['repo_name'], form_result['clone_uri']),
                     category='success')
             else:
                 h.flash(_('created repository %s') % form_result['repo_name'],
@@ @@ -380,13 +380,13 @@ class ReposController(BaseController): @@
         Runs task to update given repository with remote changes,
         ie. make pull on remote location
         :param repo_name:
         """
         try:
-            ScmModel().pull_changes(repo_name, c.rhodecode_user.username)
+            ScmModel().pull_changes(repo_name, self.rhodecode_user.username)
             h.flash(_('Pulled from remote location'), category='success')
         except Exception, e:
             h.flash(_('An error occurred during pull from remote location'),
                     category='error')
         return redirect(url('edit_repo', repo_name=repo_name))

rhodecode/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -252,13 +252,13 @@ class SettingsController(BaseController) @@
     def my_account(self):
         """
         GET /_admin/my_account Displays info about my account
         """
         # url('admin_settings_my_account')
-        c.user = UserModel().get(c.rhodecode_user.user_id, cache=False)
+        c.user = UserModel().get(self.rhodecode_user.user_id, cache=False)
         all_repos = [r.repo_name for r in self.sa.query(Repository)\
                      .filter(Repository.user_id == c.user.user_id)\
                      .order_by(func.lower(Repository.repo_name)).all()]
         c.user_repos = ScmModel().get_repos(all_repos)
         if c.user.username == 'default':
@@ @@ -280,25 +280,25 @@ class SettingsController(BaseController) @@
         #    <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.rhodecode_user.user_id
+        uid = self.rhodecode_user.user_id
         _form = UserForm(edit=True, old_data={'user_id':uid,
-                                              'email':c.rhodecode_user.email})()
+                                              'email':self.rhodecode_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 successfully'),
                     category='success')
         except formencode.Invalid, errors:
             c.user = user_model.get(c.rhodecode_user.user_id, cache=False)
             c.user = UserModel().get(c.rhodecode_user.user_id, cache=False)
             c.user = user_model.get(self.rhodecode_user.user_id, cache=False)
             c.user = UserModel().get(self.rhodecode_user.user_id, cache=False)
             all_repos = self.sa.query(Repository)\
                 .filter(Repository.user_id == c.user.user_id)\
                 .order_by(func.lower(Repository.repo_name))\
                 .all()
             c.user_repos = ScmModel().get_repos(all_repos)

rhodecode/controllers/journal.py

➞

Show inline comments

@@ @@ -46,13 +46,13 @@ log = logging.getLogger(__name__) @@
 class JournalController(BaseController):
     def __before__(self):
         super(JournalController, self).__before__()
-        c.rhodecode_user = self.rhodecode_user
+        self.rhodecode_user = self.rhodecode_user
         self.title = _('%s public journal %s feed') % (c.rhodecode_name, '%s')
         self.language = 'en-us'
         self.ttl = "5"
         self.feed_nr = 20
     @LoginRequired()

rhodecode/controllers/login.py

➞

Show inline comments

@@ @@ -49,14 +49,14 @@ class LoginController(BaseController): @@
         super(LoginController, self).__before__()
     def index(self):
         #redirect if already logged in
         c.came_from = request.GET.get('came_from', None)
         if c.rhodecode_user.is_authenticated \
                             and c.rhodecode_user.username != 'default':
         if self.rhodecode_user.is_authenticated \
                             and self.rhodecode_user.username != 'default':
             return redirect(url('home'))
         if request.POST:
             #import Login Form validator class
             login_form = LoginForm()

rhodecode/controllers/settings.py

➞

Show inline comments

@@ @@ -186,13 +186,13 @@ class SettingsController(BaseRepoControl @@
         c.repo_info = repo_model.get_by_repo_name(repo_name)
         _form = RepoForkForm(old_data={'repo_type':c.repo_info.repo_type})()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
             form_result.update({'repo_name':repo_name})
-            repo_model.create_fork(form_result, c.rhodecode_user)
+            repo_model.create_fork(form_result, self.rhodecode_user)
             h.flash(_('forked %s repository as %s') \
                       % (repo_name, form_result['fork_name']),
                     category='success')
             action_logger(self.rhodecode_user,
                           'user_forked_repo:%s' % form_result['fork_name'],
                            repo_name, '', self.sa)

rhodecode/controllers/summary.py

➞

Show inline comments

@@ @@ -62,13 +62,13 @@ class SummaryController(BaseRepoControll @@
     def index(self):
         c.repo, dbrepo = self.scm_model.get(c.repo_name)
         c.dbrepo = dbrepo
         c.following = self.scm_model.is_following_repo(c.repo_name,
-                                             c.rhodecode_user.user_id)
+                                             self.rhodecode_user.user_id)
         def url_generator(**kw):
             return url('shortlog_home', repo_name=c.repo_name, **kw)
         c.repo_changesets = RepoPage(c.repo, page=1, items_per_page=10,
                                  url=url_generator)
@@ @@ -76,13 +76,13 @@ class SummaryController(BaseRepoControll @@
         if self.rhodecode_user.username == 'default':
             #for default(anonymous) user we don't need to pass credentials
             username = ''
             password = ''
         else:
-            username = str(c.rhodecode_user.username)
+            username = str(self.rhodecode_user.username)
             password = '@'
         uri = u'%(protocol)s://%(user)s%(password)s%(host)s%(prefix)s/%(repo_name)s' % {
                                         'protocol': e.get('wsgi.url_scheme'),
                                         'user':username,
                                         'password':password,

0 comments (0 inline, 0 general)