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

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
=== modified file 'django_project/settings_base.py'
--- django_project/settings_base.py 2015-12-14 07:30:12 +0000
+++ django_project/settings_base.py 2016-02-19 17:13:55 +0000
@@ -298,7 +298,6 @@
298 'reviewsapp.middleware.stats.GraphiteMiddleware',298 'reviewsapp.middleware.stats.GraphiteMiddleware',
299]299]
300MODERATORS_GROUP = 'rnr-moderators'300MODERATORS_GROUP = 'rnr-moderators'
301MODIFY_WINDOW_MINUTES = 120
302MONTH_DAY_FORMAT = 'F j'301MONTH_DAY_FORMAT = 'F j'
303NON_PPA_ARCHIVE_ROOTS = {302NON_PPA_ARCHIVE_ROOTS = {
304 'http://extras.ubuntu.com/': 'lp-ppa-app-review-board',303 'http://extras.ubuntu.com/': 'lp-ppa-app-review-board',
305304
=== modified file 'src/reviewsapp/api/handlers.py'
--- src/reviewsapp/api/handlers.py 2014-10-09 19:32:45 +0000
+++ src/reviewsapp/api/handlers.py 2016-02-19 17:13:55 +0000
@@ -361,13 +361,7 @@
361 """Uses PUT verb to modify an existing review"""361 """Uses PUT verb to modify an existing review"""
362 review = get_object_or_404(Review, id=review_id, reviewer=request.user)362 review = get_object_or_404(Review, id=review_id, reviewer=request.user)
363363
364 # check review modify window has not closed before allowing update364 if review.is_awaiting_moderation():
365 time_diff = datetime.now(pytz.utc) - review.date_created
366 time_limit = timedelta(minutes=settings.MODIFY_WINDOW_MINUTES)
367 if time_diff > time_limit:
368 return HttpResponseForbidden(
369 "This review cannot be edited (edit window expired).")
370 elif review.is_awaiting_moderation():
371 return HttpResponseForbidden(365 return HttpResponseForbidden(
372 "This review cannot be edited (pending moderation).")366 "This review cannot be edited (pending moderation).")
373 else:367 else:
374368
=== modified file 'src/reviewsapp/tests/test_handlers.py'
--- src/reviewsapp/tests/test_handlers.py 2014-10-09 19:32:45 +0000
+++ src/reviewsapp/tests/test_handlers.py 2016-02-19 17:13:55 +0000
@@ -1236,14 +1236,6 @@
1236 review.reviewer)1236 review.reviewer)
1237 self.assertEqual(httplib.FORBIDDEN, response.status_code)1237 self.assertEqual(httplib.FORBIDDEN, response.status_code)
12381238
1239 def test_modify_time_limits(self):
1240 old_time = (datetime.now(pytz.utc) -
1241 timedelta(settings.MODIFY_WINDOW_MINUTES + 60))
1242 review = self.factory.makeReview(date_created=old_time)
1243 response = self._modify_review_id(
1244 review.id, self.post_data, review.reviewer)
1245 self.assertEqual(httplib.FORBIDDEN, response.status_code)
1246
1247 def test_stats_update_on_modify(self):1239 def test_stats_update_on_modify(self):
1248 software_item = self.factory.makeSoftwareItem(1240 software_item = self.factory.makeSoftwareItem(
1249 package_name='compiz-core',1241 package_name='compiz-core',

Subscribers

People subscribed via source and target branches