kallithea Changeset - 7efc8dcc0dc4

Changeset - 7efc8dcc0dc4

Parent rev.

Child rev.

[Not reviewed]

default

0 9 0

Marcin Kuzminski - 13 years ago 2013-04-13 12:51:34
marcin@python-works.com

usage of request.GET is now more consistent

9 files changed with 14 insertions and 18 deletions:

rhodecode/controllers/admin/admin.py

rhodecode/controllers/admin/notifications.py

rhodecode/controllers/changelog.py

rhodecode/controllers/followers.py

rhodecode/controllers/forks.py

rhodecode/controllers/journal.py

rhodecode/controllers/pullrequests.py

rhodecode/controllers/search.py

rhodecode/controllers/shortlog.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/admin.py

➞

Show inline comments

@@ @@ -133,13 +133,13 @@ class AdminController(BaseController): @@
         except Exception:
             # we want this to crash for now
             raise
         users_log = users_log.order_by(UserLog.action_date.desc())
-        p = safe_int(request.params.get('page', 1), 1)
+        p = safe_int(request.GET.get('page', 1), 1)
         def url_generator(**kw):
             return url.current(filter=c.search_term, **kw)
         c.users_log = Page(users_log, page=p, items_per_page=10, url=url_generator)
         c.log_data = render('admin/admin_log.html')

rhodecode/controllers/admin/notifications.py

➞

Show inline comments

@@ @@ -61,13 +61,13 @@ class NotificationsController(BaseContro @@
         """GET /_admin/notifications: All items in the collection"""
         # url('notifications')
         c.user = self.rhodecode_user
         notif = NotificationModel().get_for_user(self.rhodecode_user.user_id,
                                             filter_=request.GET.getall('type'))
-        p = safe_int(request.params.get('page', 1), 1)
+        p = safe_int(request.GET.get('page', 1), 1)
         c.notifications = Page(notif, page=p, items_per_page=10)
         c.pull_request_type = Notification.TYPE_PULL_REQUEST
         c.comment_type = [Notification.TYPE_CHANGESET_COMMENT,
                           Notification.TYPE_PULL_REQUEST_COMMENT]
         _current_filter = request.GET.getall('type')

rhodecode/controllers/changelog.py

➞

Show inline comments

@@ @@ -51,26 +51,22 @@ class ChangelogController(BaseRepoContro @@
         super(ChangelogController, self).__before__()
         c.affected_files_cut_off = 60
     def index(self):
         limit = 100
         default = 20
         if request.params.get('size'):
             try:
                 int_size = int(request.params.get('size'))
             except ValueError:
                 int_size = default
             c.size = max(min(int_size, limit), 1)
         if request.GET.get('size'):
             c.size = max(min(safe_int(request.GET.get('size')), limit), 1)
             session['changelog_size'] = c.size
             session.save()
         else:
             c.size = int(session.get('changelog_size', default))
         # min size must be 1
         c.size = max(c.size, 1)
         p = safe_int(request.params.get('page', 1), 1)
         branch_name = request.params.get('branch', None)
         p = safe_int(request.GET.get('page', 1), 1)
         branch_name = request.GET.get('branch', None)
         try:
             if branch_name:
                 collection = [z for z in
                               c.rhodecode_repo.get_changesets(start=0,
                                                     branch_name=branch_name)]
                 c.total_cs = len(collection)

rhodecode/controllers/followers.py

➞

Show inline comments

@@ @@ -41,13 +41,13 @@ class FollowersController(BaseRepoContro @@
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(FollowersController, self).__before__()
     def followers(self, repo_name):
-        p = safe_int(request.params.get('page', 1), 1)
+        p = safe_int(request.GET.get('page', 1), 1)
         repo_id = c.rhodecode_db_repo.repo_id
         d = UserFollowing.get_repo_followers(repo_id)\
             .order_by(UserFollowing.follows_from)
         c.followers_pager = Page(d, page=p, items_per_page=20)
         c.followers_data = render('/followers/followers_data.html')

rhodecode/controllers/forks.py

➞

Show inline comments

@@ @@ -107,13 +107,13 @@ class ForksController(BaseRepoController @@
         return defaults
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def forks(self, repo_name):
-        p = safe_int(request.params.get('page', 1), 1)
+        p = safe_int(request.GET.get('page', 1), 1)
         repo_id = c.rhodecode_db_repo.repo_id
         d = []
         for r in Repository.get_repo_forks(repo_id):
             if not HasRepoPermissionAny(
                 'repository.read', 'repository.write', 'repository.admin'
             )(r.repo_name, 'get forks check'):

rhodecode/controllers/journal.py

➞

Show inline comments

@@ @@ -59,13 +59,13 @@ class JournalController(BaseController): @@
         c.search_term = request.GET.get('filter')
     @LoginRequired()
     @NotAnonymous()
     def index(self):
         # Return a rendered template
-        p = safe_int(request.params.get('page', 1), 1)
+        p = safe_int(request.GET.get('page', 1), 1)
         c.user = User.get(self.rhodecode_user.user_id)
         c.following = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == self.rhodecode_user.user_id)\
             .options(joinedload(UserFollowing.follows_repository))\
             .all()
@@ @@ -247,13 +247,13 @@ class JournalController(BaseController): @@
         log.debug('token mismatch %s vs %s' % (cur_token, token))
         raise HTTPBadRequest()
     @LoginRequired()
     def public_journal(self):
         # Return a rendered template
-        p = safe_int(request.params.get('page', 1), 1)
+        p = safe_int(request.GET.get('page', 1), 1)
         c.following = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == self.rhodecode_user.user_id)\
             .options(joinedload(UserFollowing.follows_repository))\
             .all()

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -139,13 +139,13 @@ class PullrequestsController(BaseRepoCon @@
                                                    pull_request.reviewers]
         return (self.rhodecode_user.admin or owner or reviewer)
     def show_all(self, repo_name):
         c.pull_requests = PullRequestModel().get_all(repo_name)
         c.repo_name = repo_name
-        p = safe_int(request.params.get('page', 1), 1)
+        p = safe_int(request.GET.get('page', 1), 1)
         c.pullrequests_pager = Page(c.pull_requests, page=p, items_per_page=10)
         c.pullrequest_data = render('/pullrequests/pullrequest_data.html')
         if request.environ.get('HTTP_X_PARTIAL_XHR'):

rhodecode/controllers/search.py

➞

Show inline comments

@@ @@ -81,13 +81,13 @@ class SearchController(BaseRepoControlle @@
         if c.cur_query:
             cur_query = c.cur_query.lower()
             log.debug(cur_query)
         if c.cur_query:
-            p = safe_int(request.params.get('page', 1), 1)
+            p = safe_int(request.GET.get('page', 1), 1)
             highlight_items = set()
             try:
                 idx = open_dir(config['app_conf']['index_dir'],
                                indexname=index_name)
                 searcher = idx.searcher()

rhodecode/controllers/shortlog.py

➞

Show inline comments

@@ @@ -61,14 +61,14 @@ class ShortlogController(BaseRepoControl @@
             return c.rhodecode_repo.get_changeset(rev)
         except RepositoryError, e:
             h.flash(str(e), category='warning')
             redirect(h.url('shortlog_home', repo_name=repo_name))
     def index(self, repo_name, revision=None, f_path=None):
         p = safe_int(request.params.get('page', 1), 1)
         size = safe_int(request.params.get('size', 20), 20)
         p = safe_int(request.GET.get('page', 1), 1)
         size = safe_int(request.GET.get('size', 20), 20)
         collection = c.rhodecode_repo
         c.file_history = f_path
         def url_generator(**kw):
             if f_path:
                 return url('shortlog_file_home', repo_name=repo_name,

0 comments (0 inline, 0 general)