Ratings and Reviews server

Merge lp:~fgallina/rnr-server/no-deb-review-edit-limit into lp:rnr-server

  1. no-deb-review-edit-limit
  2. Merge into trunk
Proposed by Fabián Ezequiel Gallina
Status: Merged
Approved by: Fabián Ezequiel Gallina
Approved revision: 315
Merged at revision: 315
Proposed branch: lp:~fgallina/rnr-server/no-deb-review-edit-limit
Merge into: lp:rnr-server
Diff against target: 49 lines (+1/-16)
3 files modified
django_project/settings_base.py (+0/-1)
src/reviewsapp/api/handlers.py (+1/-7)
src/reviewsapp/tests/test_handlers.py (+0/-8)
To merge this branch: bzr merge lp:~fgallina/rnr-server/no-deb-review-edit-limit
Reviewer Review Type Date Requested Status
Matias Bordese (community) Approve
Review via email: mp+286691@code.launchpad.net

Commit message

Do not limit deb review edit time

Fixes #1540635

To post a comment you must log in.
Revision history for this message
Matias Bordese (matiasb) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'django_project/settings_base.py'
2--- django_project/settings_base.py 2015-12-14 07:30:12 +0000
3+++ django_project/settings_base.py 2016-02-19 17:13:55 +0000
4@@ -298,7 +298,6 @@
5 'reviewsapp.middleware.stats.GraphiteMiddleware',
6 ]
7 MODERATORS_GROUP = 'rnr-moderators'
8-MODIFY_WINDOW_MINUTES = 120
9 MONTH_DAY_FORMAT = 'F j'
10 NON_PPA_ARCHIVE_ROOTS = {
11 'http://extras.ubuntu.com/': 'lp-ppa-app-review-board',
12
13=== modified file 'src/reviewsapp/api/handlers.py'
14--- src/reviewsapp/api/handlers.py 2014-10-09 19:32:45 +0000
15+++ src/reviewsapp/api/handlers.py 2016-02-19 17:13:55 +0000
16@@ -361,13 +361,7 @@
17 """Uses PUT verb to modify an existing review"""
18 review = get_object_or_404(Review, id=review_id, reviewer=request.user)
19
20- # check review modify window has not closed before allowing update
21- time_diff = datetime.now(pytz.utc) - review.date_created
22- time_limit = timedelta(minutes=settings.MODIFY_WINDOW_MINUTES)
23- if time_diff > time_limit:
24- return HttpResponseForbidden(
25- "This review cannot be edited (edit window expired).")
26- elif review.is_awaiting_moderation():
27+ if review.is_awaiting_moderation():
28 return HttpResponseForbidden(
29 "This review cannot be edited (pending moderation).")
30 else:
31
32=== modified file 'src/reviewsapp/tests/test_handlers.py'
33--- src/reviewsapp/tests/test_handlers.py 2014-10-09 19:32:45 +0000
34+++ src/reviewsapp/tests/test_handlers.py 2016-02-19 17:13:55 +0000
35@@ -1236,14 +1236,6 @@
36 review.reviewer)
37 self.assertEqual(httplib.FORBIDDEN, response.status_code)
38
39- def test_modify_time_limits(self):
40- old_time = (datetime.now(pytz.utc) -
41- timedelta(settings.MODIFY_WINDOW_MINUTES + 60))
42- review = self.factory.makeReview(date_created=old_time)
43- response = self._modify_review_id(
44- review.id, self.post_data, review.reviewer)
45- self.assertEqual(httplib.FORBIDDEN, response.status_code)
46-
47 def test_stats_update_on_modify(self):
48 software_item = self.factory.makeSoftwareItem(
49 package_name='compiz-core',

Subscribers

People subscribed via source and target branches