From a1db1e4871d50f71b6fcbe826bb96fe8fc63cd46 Mon Sep 17 00:00:00 2001 From: Shivam Singhal Date: Wed, 16 May 2018 23:31:26 +0530 Subject: [PATCH] Fix: Removing notifycompat & notifyevents (#8258) --- src/olympia/access/fixtures/access/login.json | 4 ---- .../fixtures/addons/addon_228106_info+dev+bio.json | 2 -- .../addons/addon_228107_multiple-devs.json | 4 ---- .../fixtures/base/addon_10423_youtubesearch.json | 2 -- .../amo/fixtures/base/addon_1833_yoono.json | 2 -- src/olympia/amo/fixtures/base/addon_3615.json | 2 -- .../amo/fixtures/base/addon_3723_listed.json | 4 +--- src/olympia/amo/fixtures/base/addon_40.json | 4 +--- src/olympia/amo/fixtures/base/addon_4594_a9.json | 4 +--- .../amo/fixtures/base/addon_4664_twitterbar.json | 2 -- src/olympia/amo/fixtures/base/addon_5299_gcal.json | 2 -- src/olympia/amo/fixtures/base/addon_5369.json | 4 +--- src/olympia/amo/fixtures/base/addon_5579.json | 2 -- src/olympia/amo/fixtures/base/addon_592.json | 4 +--- src/olympia/amo/fixtures/base/addon_6113.json | 4 +--- .../amo/fixtures/base/addon_6704_grapple.json | 4 +--- src/olympia/amo/fixtures/base/addontag.json | 4 +--- src/olympia/amo/fixtures/base/admin.json | 4 +--- .../amo/fixtures/base/collection_57181.json | 4 +--- src/olympia/amo/fixtures/base/user_2519.json | 2 -- src/olympia/amo/fixtures/base/user_4043307.json | 2 -- src/olympia/amo/fixtures/base/user_999.json | 2 -- src/olympia/amo/fixtures/base/users.json | 14 -------------- .../devhub/fixtures/devhub/addon-file-100456.json | 4 +--- .../devhub/fixtures/devhub/addon-validation-1.json | 4 +--- .../ratings/fixtures/ratings/dev-reply.json | 4 ---- .../ratings/fixtures/ratings/three-reviews.json | 4 +--- .../fixtures/reviewers/user_persona_reviewer.json | 2 -- src/olympia/users/admin.py | 3 +-- .../users/fixtures/users/test_backends.json | 10 +--------- src/olympia/users/models.py | 2 -- src/olympia/zadmin/fixtures/zadmin/users.json | 2 -- 32 files changed, 15 insertions(+), 102 deletions(-) diff --git a/src/olympia/access/fixtures/access/login.json b/src/olympia/access/fixtures/access/login.json index 1edab7119d..7f7e18aead 100644 --- a/src/olympia/access/fixtures/access/login.json +++ b/src/olympia/access/fixtures/access/login.json @@ -7,8 +7,6 @@ "email": "scott@bakula.com", "display_collections": 1, "display_collections_fav": 1, - "notifycompat": 1, - "notifyevents": 1, "created": "2010-09-08 07:06:05", "modified": "2010-09-08 07:06:05" } @@ -21,8 +19,6 @@ "email": "milos@dinic.com", "display_collections": 1, "display_collections_fav": 1, - "notifycompat": 1, - "notifyevents": 1, "created": "2010-09-08 07:06:05", "modified": "2010-09-08 07:06:05" } diff --git a/src/olympia/addons/fixtures/addons/addon_228106_info+dev+bio.json b/src/olympia/addons/fixtures/addons/addon_228106_info+dev+bio.json index 705fb3be4d..be3d4301d4 100644 --- a/src/olympia/addons/fixtures/addons/addon_228106_info+dev+bio.json +++ b/src/olympia/addons/fixtures/addons/addon_228106_info+dev+bio.json @@ -134,7 +134,6 @@ "averagerating": null, "homepage": "", "email": "the-author@nowehere.com", - "notifycompat": false, "username": "theauthor", "biography": "Bio: This is line one.\n\nThis is line two", "failed_login_attempts": 0, @@ -145,7 +144,6 @@ "notes": "", "modified": "2010-09-12 07:34:47", "last_login_ip": "", - "notifyevents": false, "last_login": "2010-09-12 07:34:47" } }, diff --git a/src/olympia/addons/fixtures/addons/addon_228107_multiple-devs.json b/src/olympia/addons/fixtures/addons/addon_228107_multiple-devs.json index c5c244e204..c8a718b64a 100644 --- a/src/olympia/addons/fixtures/addons/addon_228107_multiple-devs.json +++ b/src/olympia/addons/fixtures/addons/addon_228107_multiple-devs.json @@ -146,7 +146,6 @@ "averagerating": null, "homepage": "", "email": "the-author1@nowehere.com", - "notifycompat": false, "username": "theauthor1", "biography": "Bio1: This is line one.\n\nThis is line two", "failed_login_attempts": 0, @@ -157,7 +156,6 @@ "notes": "", "modified": "2010-09-12 07:34:47", "last_login_ip": "", - "notifyevents": false, "last_login": "2010-09-12 07:34:47" } }, @@ -174,7 +172,6 @@ "averagerating": null, "homepage": "", "email": "the-author2@nowehere.com", - "notifycompat": false, "username": "theauthor2", "biography": "Bio2: This is line one.\n\nThis is line two", "failed_login_attempts": 0, @@ -185,7 +182,6 @@ "notes": "", "modified": "2010-09-12 07:34:47", "last_login_ip": "", - "notifyevents": false, "last_login": "2010-09-12 07:34:47" } }, diff --git a/src/olympia/amo/fixtures/base/addon_10423_youtubesearch.json b/src/olympia/amo/fixtures/base/addon_10423_youtubesearch.json index 55ff5c652e..93da76696f 100644 --- a/src/olympia/amo/fixtures/base/addon_10423_youtubesearch.json +++ b/src/olympia/amo/fixtures/base/addon_10423_youtubesearch.json @@ -146,7 +146,6 @@ "display_collections": false, "averagerating": 4.84, "display_name": "ditman", - "notifycompat": true, "picture_type": "", "occupation": "", "homepage": "http://www.ditman.net", @@ -162,7 +161,6 @@ "notes": null, "modified": "2009-01-19 15:19:53", "last_login_ip": "", - "notifyevents": true, "last_login": "2009-01-19 15:19:53" } }, diff --git a/src/olympia/amo/fixtures/base/addon_1833_yoono.json b/src/olympia/amo/fixtures/base/addon_1833_yoono.json index 3daf9dc075..ecee8cc9d1 100644 --- a/src/olympia/amo/fixtures/base/addon_1833_yoono.json +++ b/src/olympia/amo/fixtures/base/addon_1833_yoono.json @@ -100,7 +100,6 @@ "display_collections": false, "averagerating": 4.24, "display_name": null, - "notifycompat": true, "picture_type": "", "occupation": "", "homepage": "http://www.yoono.com/", @@ -116,7 +115,6 @@ "notes": null, "modified": "2010-05-12 16:10:49", "last_login_ip": "", - "notifyevents": true, "last_login": "2010-05-12 16:10:49" } }, diff --git a/src/olympia/amo/fixtures/base/addon_3615.json b/src/olympia/amo/fixtures/base/addon_3615.json index 2eec8c8419..35645e5baa 100644 --- a/src/olympia/amo/fixtures/base/addon_3615.json +++ b/src/olympia/amo/fixtures/base/addon_3615.json @@ -222,7 +222,6 @@ "display_collections_fav": false, "display_collections": false, "averagerating": 3.11, - "notifycompat": true, "picture_type": "", "occupation": "", "homepage": "http://www.yahoo.com/", @@ -236,7 +235,6 @@ "created": "2007-03-05 13:09:56", "notes": null, "modified": "2010-05-19 16:41:22", - "notifyevents": true, "read_dev_agreement": "2017-09-23 00:00:00", "last_login": "2010-05-20 13:00:37" } diff --git a/src/olympia/amo/fixtures/base/addon_3723_listed.json b/src/olympia/amo/fixtures/base/addon_3723_listed.json index 7afbb7e46e..015a63fa77 100644 --- a/src/olympia/amo/fixtures/base/addon_3723_listed.json +++ b/src/olympia/amo/fixtures/base/addon_3723_listed.json @@ -66,7 +66,6 @@ "display_collections_fav": false, "display_collections": false, "averagerating": 4.75, - "notifycompat": false, "picture_type": "", "occupation": "", "homepage": "", @@ -79,8 +78,7 @@ "created": "2007-03-05 13:09:37", "notes": null, "modified": "2010-05-11 00:11:05", - "last_login": "2010-05-11 00:11:05", - "notifyevents": false + "last_login": "2010-05-11 00:11:05" } }, { diff --git a/src/olympia/amo/fixtures/base/addon_40.json b/src/olympia/amo/fixtures/base/addon_40.json index ebdd696020..f97a9055da 100644 --- a/src/olympia/amo/fixtures/base/addon_40.json +++ b/src/olympia/amo/fixtures/base/addon_40.json @@ -83,7 +83,6 @@ "display_collections_fav": false, "display_collections": false, "averagerating": 4.00, - "notifycompat": true, "picture_type": "", "occupation": "", "homepage": "", @@ -95,8 +94,7 @@ "display_name": "41 \u0627\u0644\u062a\u0637\u0628", "created": "2007-03-05 13:09:33", "notes": null, - "modified": "2007-03-05 13:09:33", - "notifyevents": true + "modified": "2007-03-05 13:09:33" } }, { diff --git a/src/olympia/amo/fixtures/base/addon_4594_a9.json b/src/olympia/amo/fixtures/base/addon_4594_a9.json index 0b01febf94..b11c320d3e 100644 --- a/src/olympia/amo/fixtures/base/addon_4594_a9.json +++ b/src/olympia/amo/fixtures/base/addon_4594_a9.json @@ -102,7 +102,6 @@ "display_collections_fav": true, "display_collections": true, "averagerating": 3.38, - "notifycompat": true, "picture_type": "image/jpeg", "occupation": "Internets", "homepage": "http://micropipes.com/blog/", @@ -114,8 +113,7 @@ "created": "2007-03-05 13:09:38", "notes": null, "modified": "2010-05-20 14:54:52", - "last_login": "2010-05-20 14:54:52", - "notifyevents": true + "last_login": "2010-05-20 14:54:52" } }, { diff --git a/src/olympia/amo/fixtures/base/addon_4664_twitterbar.json b/src/olympia/amo/fixtures/base/addon_4664_twitterbar.json index 8c65febbf3..d193721c30 100644 --- a/src/olympia/amo/fixtures/base/addon_4664_twitterbar.json +++ b/src/olympia/amo/fixtures/base/addon_4664_twitterbar.json @@ -164,7 +164,6 @@ "display_collections_fav": false, "display_collections": false, "averagerating": 4.09, - "notifycompat": true, "picture_type": "image/png", "occupation": "Software Developer", "homepage": "http://www.chrisfinke.com/", @@ -177,7 +176,6 @@ "notes": null, "modified": "2010-05-07 15:22:13", "created": "2007-03-05 13:09:34", - "notifyevents": true, "last_login": "2010-05-07 15:22:13" } }, diff --git a/src/olympia/amo/fixtures/base/addon_5299_gcal.json b/src/olympia/amo/fixtures/base/addon_5299_gcal.json index 37419e6ac2..29d44b074e 100644 --- a/src/olympia/amo/fixtures/base/addon_5299_gcal.json +++ b/src/olympia/amo/fixtures/base/addon_5299_gcal.json @@ -122,7 +122,6 @@ "display_collections_fav": true, "display_collections": true, "averagerating": 3.86, - "notifycompat": true, "picture_type": "image/jpeg", "occupation": "", "homepage": "http://ginatrapani.org", @@ -134,7 +133,6 @@ "notes": null, "created": "2007-03-05 13:09:58", "modified": "2010-05-17 13:53:12", - "notifyevents": true, "last_login": "2010-05-21 10:36:25" } }, diff --git a/src/olympia/amo/fixtures/base/addon_5369.json b/src/olympia/amo/fixtures/base/addon_5369.json index a3426ae904..044d9e5130 100644 --- a/src/olympia/amo/fixtures/base/addon_5369.json +++ b/src/olympia/amo/fixtures/base/addon_5369.json @@ -86,7 +86,6 @@ "display_collections_fav": false, "display_collections": false, "averagerating": 3.11, - "notifycompat": true, "picture_type": "", "occupation": "", "homepage": "http://www.yahoo.com/", @@ -99,8 +98,7 @@ "created": "2007-03-05 13:09:56", "notes": null, "modified": "2010-05-19 16:41:22", - "last_login": "2010-05-19 16:41:22", - "notifyevents": true + "last_login": "2010-05-19 16:41:22" } }, { diff --git a/src/olympia/amo/fixtures/base/addon_5579.json b/src/olympia/amo/fixtures/base/addon_5579.json index fa044d419e..a1a4bdeec9 100644 --- a/src/olympia/amo/fixtures/base/addon_5579.json +++ b/src/olympia/amo/fixtures/base/addon_5579.json @@ -126,7 +126,6 @@ "display_collections_fav": false, "display_collections": false, "averagerating": 4.01, - "notifycompat": true, "picture_type": "", "occupation": "", "homepage": "http://www.cooliris.com", @@ -139,7 +138,6 @@ "created": "2007-03-05 13:09:37", "notes": null, "modified": "2010-05-07 14:42:58", - "notifyevents": true, "last_login": "2010-05-07 14:42:58" } } diff --git a/src/olympia/amo/fixtures/base/addon_592.json b/src/olympia/amo/fixtures/base/addon_592.json index 03bcd9f810..e2efc4f585 100644 --- a/src/olympia/amo/fixtures/base/addon_592.json +++ b/src/olympia/amo/fixtures/base/addon_592.json @@ -97,7 +97,6 @@ "display_collections_fav": false, "display_collections": false, "averagerating": 3.83, - "notifycompat": true, "picture_type": "", "occupation": "", "homepage": "http://richard.jones.name", @@ -109,8 +108,7 @@ "display_name": "802 \u0627\u0644\u062a\u0637\u0628", "created": "2007-03-05 13:09:33", "notes": null, - "modified": "2007-11-15 02:59:19", - "notifyevents": true + "modified": "2007-11-15 02:59:19" } }, { diff --git a/src/olympia/amo/fixtures/base/addon_6113.json b/src/olympia/amo/fixtures/base/addon_6113.json index f1e28edf4b..d24596e218 100644 --- a/src/olympia/amo/fixtures/base/addon_6113.json +++ b/src/olympia/amo/fixtures/base/addon_6113.json @@ -81,7 +81,6 @@ "display_collections_fav": false, "display_collections": true, "averagerating": 4.33, - "notifycompat": true, "picture_type": "", "occupation": "", "homepage": "", @@ -93,8 +92,7 @@ "display_name": "softcup \u0627\u0644\u062a\u0637\u0628", "created": "2007-03-05 13:09:37", "notes": null, - "modified": "2009-07-16 07:35:59", - "notifyevents": true + "modified": "2009-07-16 07:35:59" } }, { diff --git a/src/olympia/amo/fixtures/base/addon_6704_grapple.json b/src/olympia/amo/fixtures/base/addon_6704_grapple.json index 6c6eb1a1b1..9fcca8afcb 100644 --- a/src/olympia/amo/fixtures/base/addon_6704_grapple.json +++ b/src/olympia/amo/fixtures/base/addon_6704_grapple.json @@ -91,7 +91,6 @@ "display_collections_fav": false, "display_collections": false, "averagerating": 4.88, - "notifycompat": true, "picture_type": "", "occupation": "", "homepage": "http://www.takebacktheweb.org", @@ -103,8 +102,7 @@ "display_name": "Aronnax", "created": "2007-03-05 13:09:33", "notes": null, - "modified": "2009-08-19 07:35:43", - "notifyevents": true + "modified": "2009-08-19 07:35:43" } }, { diff --git a/src/olympia/amo/fixtures/base/addontag.json b/src/olympia/amo/fixtures/base/addontag.json index 8631273ee2..52e5c79a9c 100644 --- a/src/olympia/amo/fixtures/base/addontag.json +++ b/src/olympia/amo/fixtures/base/addontag.json @@ -35,14 +35,12 @@ "averagerating": 4.93, "homepage": "http://www.podvalchik.ru", "email": "4043307@yermom.com", - "notifycompat": 1, "biography": null, "deleted": 0, "username": "Wink-RU", "display_name": "Wink-RU \u0627\u0644\u062a\u0637\u0628", "created": "2008-08-29 06:53:46", - "modified": "2009-09-26 21:25:10", - "notifyevents": 1 + "modified": "2009-09-26 21:25:10" } }, { diff --git a/src/olympia/amo/fixtures/base/admin.json b/src/olympia/amo/fixtures/base/admin.json index 211501df8e..f1e8013421 100644 --- a/src/olympia/amo/fixtures/base/admin.json +++ b/src/olympia/amo/fixtures/base/admin.json @@ -11,15 +11,13 @@ "averagerating": null, "homepage": "http://jeffbalogh.org", "email": "jbalogh@mozilla.com", - "notifycompat": 1, "biography": null, "deleted": 0, "username": "jbalogh", "created": "2009-02-02 11:50:31", "notes": "", "modified": "2010-01-12 17:01:41", - "last_login": "2010-01-12 17:01:41", - "notifyevents": 1 + "last_login": "2010-01-12 17:01:41" } }, { diff --git a/src/olympia/amo/fixtures/base/collection_57181.json b/src/olympia/amo/fixtures/base/collection_57181.json index 2cda0ab32f..59349f34a8 100644 --- a/src/olympia/amo/fixtures/base/collection_57181.json +++ b/src/olympia/amo/fixtures/base/collection_57181.json @@ -11,14 +11,12 @@ "averagerating": null, "homepage": "", "email": "dd+fe1175df5@davedash.com", - "notifycompat": true, "biography": null, "deleted": false, "username": "dsmailin", "created": "2010-02-19 00:52:22", "notes": null, - "modified": "2010-02-19 06:32:19", - "notifyevents": true + "modified": "2010-02-19 06:32:19" } }, { diff --git a/src/olympia/amo/fixtures/base/user_2519.json b/src/olympia/amo/fixtures/base/user_2519.json index 3b8c58dffe..c44bf93f99 100644 --- a/src/olympia/amo/fixtures/base/user_2519.json +++ b/src/olympia/amo/fixtures/base/user_2519.json @@ -11,7 +11,6 @@ "averagerating": 4.09, "homepage": "http://www.chrisfinke.com/", "email": "dd+357b3dde1@davedash.com", - "notifycompat": true, "biography": null, "deleted": false, "username": "cfinke", @@ -19,7 +18,6 @@ "created": "2007-03-05 13:09:34", "notes": null, "modified": "2010-05-07 15:22:13", - "notifyevents": true, "last_login": "2007-03-05 13:09:34" } } diff --git a/src/olympia/amo/fixtures/base/user_4043307.json b/src/olympia/amo/fixtures/base/user_4043307.json index a05c65e2a7..0b7fc0db42 100644 --- a/src/olympia/amo/fixtures/base/user_4043307.json +++ b/src/olympia/amo/fixtures/base/user_4043307.json @@ -11,7 +11,6 @@ "averagerating": null, "homepage": "http://jeffbalogh.org", "email": "dd+605fa45e4@davedash.com", - "notifycompat": true, "biography": null, "deleted": false, "username": "jbalogh", @@ -19,7 +18,6 @@ "created": "2009-02-02 11:50:31", "notes": null, "modified": "2010-02-02 22:33:40", - "notifyevents": true, "last_login": "2010-02-02 22:33:40" } } diff --git a/src/olympia/amo/fixtures/base/user_999.json b/src/olympia/amo/fixtures/base/user_999.json index 770305c79a..fd8657becf 100644 --- a/src/olympia/amo/fixtures/base/user_999.json +++ b/src/olympia/amo/fixtures/base/user_999.json @@ -9,7 +9,6 @@ "averagerating": null, "homepage": "", "email": "regular@mozilla.com", - "notifycompat": 1, "biography": null, "deleted": 0, "username": "regularuser", @@ -17,7 +16,6 @@ "created": "2009-02-02 11:50:31", "notes": "", "modified": "2010-01-12 17:01:41", - "notifyevents": 1, "read_dev_agreement": "2017-09-23 00:00:00" }, "model": "users.userprofile", diff --git a/src/olympia/amo/fixtures/base/users.json b/src/olympia/amo/fixtures/base/users.json index dd51c321a0..6ca73e5eb4 100644 --- a/src/olympia/amo/fixtures/base/users.json +++ b/src/olympia/amo/fixtures/base/users.json @@ -9,7 +9,6 @@ "averagerating": null, "homepage": "", "email": "regular@mozilla.com", - "notifycompat": 1, "biography": null, "deleted": 0, "username": "regularuser", @@ -17,7 +16,6 @@ "created": "2009-02-02 11:50:31", "notes": "", "modified": "2010-01-12 17:01:41", - "notifyevents": 1, "read_dev_agreement": "2017-09-23 00:00:00", "last_login": "2012-05-22 14:59:28" }, @@ -31,7 +29,6 @@ "display_collections_fav": 1, "display_collections": 1, "averagerating": 3.39, - "notifycompat": 1, "picture_type": "image/jpeg", "occupation": "Internets", "homepage": "http://micropipes.com/blog/", @@ -44,7 +41,6 @@ "created": "2007-03-05 13:09:38", "notes": "", "modified": "2010-03-19 13:50:38", - "notifyevents": 1, "read_dev_agreement": "2017-09-23 00:00:00", "last_login": "2012-05-22 14:59:28" } @@ -59,7 +55,6 @@ "averagerating": null, "homepage": "http://jeffbalogh.org", "email": "admin@mozilla.com", - "notifycompat": 1, "biography": null, "deleted": 0, "username": "admin", @@ -67,7 +62,6 @@ "created": "2009-02-02 11:50:31", "notes": "", "modified": "2010-01-12 17:01:41", - "notifyevents": 1, "read_dev_agreement": "2017-09-23 00:00:00", "last_login": "2012-05-22 14:59:28" }, @@ -84,7 +78,6 @@ "averagerating": null, "homepage": "http://mozilla.org", "email": "taskuser@mozilla.com", - "notifycompat": 1, "biography": null, "deleted": 0, "username": "mozilla", @@ -92,7 +85,6 @@ "created": "2009-02-02 11:50:31", "notes": "", "modified": "2010-01-12 17:01:41", - "notifyevents": 1, "read_dev_agreement": "2017-09-23 00:00:00", "last_login": "2012-05-22 14:59:28" }, @@ -105,7 +97,6 @@ "display_collections_fav": false, "display_collections": false, "email": "reviewer@mozilla.com", - "notifycompat": false, "username": "reviewer", "failed_login_attempts": 0, "deleted": false, @@ -114,7 +105,6 @@ "created": "2010-10-19 13:02:25", "modified": "2010-11-16 10:51:34", "last_login_ip": "127.0.0.1", - "notifyevents": false, "read_dev_agreement": "2017-09-23 00:00:00", "last_login": "2012-05-22 14:59:28" } @@ -126,7 +116,6 @@ "display_collections_fav": false, "display_collections": false, "email": "persona_reviewer@mozilla.com", - "notifycompat": false, "username": "Persona Reviewer", "failed_login_attempts": 0, "deleted": false, @@ -135,7 +124,6 @@ "created": "2010-10-19 13:02:25", "modified": "2010-11-16 10:51:34", "last_login_ip": "127.0.0.1", - "notifyevents": false, "read_dev_agreement": "2017-09-23 00:00:00", "last_login": "2012-05-22 14:59:28" } @@ -153,7 +141,6 @@ "averagerating": null, "homepage": "", "email": "partner@mozilla.com", - "notifycompat": true, "username": "partner", "biography": null, "failed_login_attempts": 0, @@ -164,7 +151,6 @@ "notes": null, "modified": "2011-12-01 16:20:56", "last_login_ip": "", - "notifyevents": true, "read_dev_agreement": "2017-09-23 00:00:00", "last_login": "2012-05-22 14:59:28" } diff --git a/src/olympia/devhub/fixtures/devhub/addon-file-100456.json b/src/olympia/devhub/fixtures/devhub/addon-file-100456.json index 7ec06f8982..a3424abeb9 100644 --- a/src/olympia/devhub/fixtures/devhub/addon-file-100456.json +++ b/src/olympia/devhub/fixtures/devhub/addon-file-100456.json @@ -108,7 +108,6 @@ "display_collections_fav": false, "display_collections": false, "averagerating": 3.11, - "notifycompat": true, "picture_type": "", "occupation": "", "homepage": "http://www.yahoo.com/", @@ -120,8 +119,7 @@ "display_name": "55021 \u0627\u0644\u062a\u0637\u0628", "created": "2007-03-05 13:09:56", "notes": null, - "modified": "2010-05-19 16:41:22", - "notifyevents": true + "modified": "2010-05-19 16:41:22" } }, { diff --git a/src/olympia/devhub/fixtures/devhub/addon-validation-1.json b/src/olympia/devhub/fixtures/devhub/addon-validation-1.json index fc89c41d1c..01f98b4f6b 100644 --- a/src/olympia/devhub/fixtures/devhub/addon-validation-1.json +++ b/src/olympia/devhub/fixtures/devhub/addon-validation-1.json @@ -108,7 +108,6 @@ "display_collections_fav": false, "display_collections": false, "averagerating": 3.11, - "notifycompat": true, "picture_type": "", "occupation": "", "homepage": "http://www.yahoo.com/", @@ -121,8 +120,7 @@ "created": "2007-03-05 13:09:56", "notes": null, "modified": "2010-05-19 16:41:22", - "last_login": "2010-05-19 16:41:22", - "notifyevents": true + "last_login": "2010-05-19 16:41:22" } }, { diff --git a/src/olympia/ratings/fixtures/ratings/dev-reply.json b/src/olympia/ratings/fixtures/ratings/dev-reply.json index 6a0e55bb93..aa395e9ebb 100644 --- a/src/olympia/ratings/fixtures/ratings/dev-reply.json +++ b/src/olympia/ratings/fixtures/ratings/dev-reply.json @@ -35,14 +35,12 @@ "averagerating": null, "homepage": "http://povierennyy.hmarka.net/", "email": "root_x@ukr.net", - "notifycompat": true, "biography": null, "deleted": false, "username": "root_x", "created": "2010-04-21 12:29:12", "notes": null, "modified": "2010-05-12 17:48:13", - "notifyevents": true, "last_login": "2010-05-12 17:53:01" } }, @@ -90,14 +88,12 @@ "averagerating": 4.70, "homepage": "http://adblockplus.org/", "email": "trev@adblockplus.org", - "notifycompat": true, "biography": null, "deleted": false, "username": "Wladimir Palant", "created": "2007-03-05 13:09:33", "notes": null, "modified": "2010-05-14 09:30:04", - "notifyevents": true, "last_login": "2010-05-14 09:30:04" } }, diff --git a/src/olympia/ratings/fixtures/ratings/three-reviews.json b/src/olympia/ratings/fixtures/ratings/three-reviews.json index b119e09666..469c351457 100644 --- a/src/olympia/ratings/fixtures/ratings/three-reviews.json +++ b/src/olympia/ratings/fixtures/ratings/three-reviews.json @@ -91,15 +91,13 @@ "averagerating": null, "homepage": "", "email": "happyreader@gmx.net", - "notifycompat": 1, "deleted": 0, "user": null, "biography": null, "username": "Join2", "created": "2009-05-16 05:29:58", "notes": "", - "modified": "2009-07-07 01:13:54", - "notifyevents": 1 + "modified": "2009-07-07 01:13:54" } }, { diff --git a/src/olympia/reviewers/fixtures/reviewers/user_persona_reviewer.json b/src/olympia/reviewers/fixtures/reviewers/user_persona_reviewer.json index d2c336844c..379acc3f31 100644 --- a/src/olympia/reviewers/fixtures/reviewers/user_persona_reviewer.json +++ b/src/olympia/reviewers/fixtures/reviewers/user_persona_reviewer.json @@ -12,7 +12,6 @@ "averagerating": null, "homepage": "", "email": "persona_reviewer@mozilla.com", - "notifycompat": true, "username": "persona_reviewer", "biography": null, "failed_login_attempts": 0, @@ -24,7 +23,6 @@ "notes": null, "modified": "2012-05-22 14:59:28", "last_login_ip": "127.0.0.1", - "notifyevents": true, "last_login": "2012-05-22 14:59:28" } }, diff --git a/src/olympia/users/admin.py b/src/olympia/users/admin.py index 2bf54ddae4..0de50624d1 100644 --- a/src/olympia/users/admin.py +++ b/src/olympia/users/admin.py @@ -23,8 +23,7 @@ class UserAdmin(admin.ModelAdmin): }), ('Flags', { 'fields': ('deleted', 'display_collections', - 'display_collections_fav', 'is_public', - 'notifycompat', 'notifyevents'), + 'display_collections_fav', 'is_public'), }), ('Admin', { 'fields': ('notes', 'picture_type'), diff --git a/src/olympia/users/fixtures/users/test_backends.json b/src/olympia/users/fixtures/users/test_backends.json index 1c90154b9d..e0410d5223 100644 --- a/src/olympia/users/fixtures/users/test_backends.json +++ b/src/olympia/users/fixtures/users/test_backends.json @@ -12,7 +12,6 @@ "homepage": "http://jeffbalogh.org", "email": "jbalogh@mozilla.com", "fxa_id": "0824087ad88043e2a52bd41f51bbbe79", - "notifycompat": 1, "biography": null, "deleted": false, "username": "jbalogh", @@ -20,7 +19,6 @@ "created": "2009-02-02 11:50:31", "notes": "", "modified": "2010-01-12 15:28:07", - "notifyevents": 1, "last_login_attempt": "2010-01-12 15:28:07", "last_login_attempt_ip": "192.168.1.100", "last_login_ip": "192.168.1.101", @@ -39,7 +37,6 @@ "averagerating": 3.73, "homepage": "http://www.fligtar.com", "email": "fligtar@gmail.com", - "notifycompat": 1, "biography": null, "deleted": 0, "username": "fligtar", @@ -47,7 +44,6 @@ "created": "2007-03-05 13:09:37", "notes": "", "modified": "2009-09-24 20:11:30", - "notifyevents": 1, "read_dev_agreement": "2017-09-23 00:00:00" } }, @@ -63,15 +59,13 @@ "averagerating": null, "homepage": "", "email": "testo@example.com", - "notifycompat": true, "biography": null, "deleted": false, "username": "barry", "display_name": "barry \u0627\u0644\u062a\u0637\u0628", "created": "2010-07-03 23:03:11", "notes": "", - "modified": "2010-07-23 00:37:10", - "notifyevents": true + "modified": "2010-07-23 00:37:10" } }, { @@ -113,7 +107,6 @@ "averagerating": 3.73, "homepage": "http://example.com", "email": "alice@example.com", - "notifycompat": 1, "biography": null, "deleted": 0, "username": "alice", @@ -121,7 +114,6 @@ "created": "2007-03-05 13:09:37", "notes": "", "modified": "2009-09-24 20:11:30", - "notifyevents": 1, "read_dev_agreement": "2017-09-23 00:00:00" } } diff --git a/src/olympia/users/models.py b/src/olympia/users/models.py index eff288dd8e..6f129a46b1 100644 --- a/src/olympia/users/models.py +++ b/src/olympia/users/models.py @@ -130,8 +130,6 @@ class UserProfile(OnChangeMixin, ModelBase, AbstractBaseUser): homepage = models.URLField(max_length=255, blank=True, default='') location = models.CharField(max_length=255, blank=True, default='') notes = models.TextField(blank=True, null=True) - notifycompat = models.BooleanField(default=True) - notifyevents = models.BooleanField(default=True) occupation = models.CharField(max_length=255, default='', blank=True) # This is essentially a "has_picture" flag right now picture_type = models.CharField(max_length=75, default=None, null=True, diff --git a/src/olympia/zadmin/fixtures/zadmin/users.json b/src/olympia/zadmin/fixtures/zadmin/users.json index d21f666327..63c1f25235 100644 --- a/src/olympia/zadmin/fixtures/zadmin/users.json +++ b/src/olympia/zadmin/fixtures/zadmin/users.json @@ -6,7 +6,6 @@ "display_collections_fav": 1, "display_collections": 1, "averagerating": 3.39, - "notifycompat": 1, "picture_type": "image/jpeg", "occupation": "Unemployed", "homepage": "https://www.mozilla.org/", @@ -19,7 +18,6 @@ "created": "2007-03-05 13:09:38", "notes": "", "modified": "2010-03-19 13:50:38", - "notifyevents": 1, "read_dev_agreement": "2017-09-23 00:00:00", "last_login": "2010-03-19 13:50:38" }