Mercurial > kallithea
changeset 3748:9d743ca9cede beta
usage of request.GET is now more consistent
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sat, 13 Apr 2013 12:51:34 +0200 |
| parents | 600ffde2634c |
| children | b950b884ab87 |
| files | 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 |
| diffstat | 9 files changed, 14 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/admin.py Sat Apr 13 14:36:02 2013 +0200 +++ b/rhodecode/controllers/admin/admin.py Sat Apr 13 12:51:34 2013 +0200 @@ -136,7 +136,7 @@ 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)
--- a/rhodecode/controllers/admin/notifications.py Sat Apr 13 14:36:02 2013 +0200 +++ b/rhodecode/controllers/admin/notifications.py Sat Apr 13 12:51:34 2013 +0200 @@ -64,7 +64,7 @@ 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,
--- a/rhodecode/controllers/changelog.py Sat Apr 13 14:36:02 2013 +0200 +++ b/rhodecode/controllers/changelog.py Sat Apr 13 12:51:34 2013 +0200 @@ -54,20 +54,16 @@ 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)
--- a/rhodecode/controllers/followers.py Sat Apr 13 14:36:02 2013 +0200 +++ b/rhodecode/controllers/followers.py Sat Apr 13 12:51:34 2013 +0200 @@ -44,7 +44,7 @@ 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)
--- a/rhodecode/controllers/forks.py Sat Apr 13 14:36:02 2013 +0200 +++ b/rhodecode/controllers/forks.py Sat Apr 13 12:51:34 2013 +0200 @@ -110,7 +110,7 @@ @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):
--- a/rhodecode/controllers/journal.py Sat Apr 13 14:36:02 2013 +0200 +++ b/rhodecode/controllers/journal.py Sat Apr 13 12:51:34 2013 +0200 @@ -62,7 +62,7 @@ @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 @@ @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)\
--- a/rhodecode/controllers/pullrequests.py Sat Apr 13 14:36:02 2013 +0200 +++ b/rhodecode/controllers/pullrequests.py Sat Apr 13 12:51:34 2013 +0200 @@ -147,7 +147,7 @@ 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)
--- a/rhodecode/controllers/search.py Sat Apr 13 14:36:02 2013 +0200 +++ b/rhodecode/controllers/search.py Sat Apr 13 12:51:34 2013 +0200 @@ -84,7 +84,7 @@ 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'],
--- a/rhodecode/controllers/shortlog.py Sat Apr 13 14:36:02 2013 +0200 +++ b/rhodecode/controllers/shortlog.py Sat Apr 13 12:51:34 2013 +0200 @@ -64,8 +64,8 @@ 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