kallithea Changeset - 9d743ca9cede

Changeset - 9d743ca9cede

Parent rev.

Child rev.

[Not reviewed]

beta

0 9 0

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

Grafted from: 7efc8dcc0dc4

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

@@ @@ -136,7 +136,7 @@ class AdminController(BaseController): @@
         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)

rhodecode/controllers/admin/notifications.py

➞

Show inline comments

@@ @@ -64,7 +64,7 @@ class NotificationsController(BaseContro @@
         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,

rhodecode/controllers/changelog.py

➞

Show inline comments

@@ @@ -54,20 +54,16 @@ class ChangelogController(BaseRepoContro @@
     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:
             collection = c.rhodecode_repo.get_changesets(start=0,
                                                     branch_name=branch_name)

rhodecode/controllers/followers.py

➞

Show inline comments

@@ @@ -44,7 +44,7 @@ class FollowersController(BaseRepoContro @@
         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)

rhodecode/controllers/forks.py

➞

Show inline comments

@@ @@ -110,7 +110,7 @@ class ForksController(BaseRepoController @@
     @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):

rhodecode/controllers/journal.py

➞

Show inline comments

@@ @@ -62,7 +62,7 @@ class JournalController(BaseController): @@
     @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)\
@@ @@ -250,7 +250,7 @@ class JournalController(BaseController): @@
     @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)\

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -147,7 +147,7 @@ class PullrequestsController(BaseRepoCon @@
     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)

rhodecode/controllers/search.py

➞

Show inline comments

@@ @@ -84,7 +84,7 @@ class SearchController(BaseRepoControlle @@
             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'],

rhodecode/controllers/shortlog.py

➞

Show inline comments

@@ @@ -64,8 +64,8 @@ class ShortlogController(BaseRepoControl @@
             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

0 comments (0 inline, 0 general)