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

--HG--
branch : beta

6 files changed, 13 insertions, 13 deletions

diff --git a/rhodecode/controllers/admin/repos.py b/rhodecode/controllers/admin/repos.py
index 40d955d5..cb980307 100644
--- a/rhodecode/controllers/admin/repos.py
+++ b/rhodecode/controllers/admin/repos.py
@@ -158,7 +158,7 @@ class ReposController(BaseController):
         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']),
@@ -383,7 +383,7 @@ class ReposController(BaseController):
         :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'),
diff --git a/rhodecode/controllers/admin/settings.py b/rhodecode/controllers/admin/settings.py
index 117337da..a91793de 100644
--- a/rhodecode/controllers/admin/settings.py
+++ b/rhodecode/controllers/admin/settings.py
@@ -255,7 +255,7 @@ class SettingsController(BaseController):
         """
         # 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()]
@@ -283,9 +283,9 @@ class SettingsController(BaseController):
         #           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))
@@ -294,8 +294,8 @@ class SettingsController(BaseController):
                     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))\
diff --git a/rhodecode/controllers/journal.py b/rhodecode/controllers/journal.py
index afae3efe..1643cb87 100644
--- a/rhodecode/controllers/journal.py
+++ b/rhodecode/controllers/journal.py
@@ -49,7 +49,7 @@ 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"
diff --git a/rhodecode/controllers/login.py b/rhodecode/controllers/login.py
index ae7a5cbf..b95ec112 100644
--- a/rhodecode/controllers/login.py
+++ b/rhodecode/controllers/login.py
@@ -52,8 +52,8 @@ class LoginController(BaseController):
         #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'))
 
diff --git a/rhodecode/controllers/settings.py b/rhodecode/controllers/settings.py
index 359368bb..5abd324d 100644
--- a/rhodecode/controllers/settings.py
+++ b/rhodecode/controllers/settings.py
@@ -189,7 +189,7 @@ class SettingsController(BaseRepoController):
         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')
diff --git a/rhodecode/controllers/summary.py b/rhodecode/controllers/summary.py
index 9966bbc2..b568a1ea 100644
--- a/rhodecode/controllers/summary.py
+++ b/rhodecode/controllers/summary.py
@@ -65,7 +65,7 @@ class SummaryController(BaseRepoController):
         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)
 
@@ -79,7 +79,7 @@ class SummaryController(BaseRepoController):
             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' % {