mozilla
/
addons-server
зеркало из https://github.com/mozilla/addons-server.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

remove users.(first|last|nick)name. migration in separate commit

This commit is contained in:
Wil Clouser 2012-04-11 14:47:08 -07:00
Родитель cc62cd6905
Коммит ebb8cf4dea
39 изменённых файлов: 2 добавлений и 153 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
apps/access/fixtures/access/login.json
Просмотреть файл

@ -3,10 +3,7 @@
"pk": 1,
"model": "users.userprofile",
"fields": {
"nickname": "fligtard",
"username": "fligtard",
"firstname": "Scott",
"lastname": "Bakula",
"email": "scott@bakula.com",
"emailhidden": 1,
"display_collections": 1,
@ -28,10 +25,7 @@
"pk": 2,
"model": "users.userprofile",
"fields": {
"nickname": "milos",
"username": "milos",
"firstname": "Milos",
"lastname": "Dinic",
"email": "milos@dinic.com",
"emailhidden": 1,
"display_collections": 1,

3
apps/addons/fixtures/addons/addon_228106_info+dev+bio.json
Просмотреть файл

@ -224,14 +224,11 @@
"username": "theauthor",
"bio": 1325270,
"failed_login_attempts": 0,
"firstname": "",
"deleted": false,
"lastname": "",
"emailhidden": false,
"last_login_attempt_ip": "",
"last_login_attempt": null,
"password": "nope",
"nickname": "theauthor",
"resetcode_expires": null,
"resetcode": "",
"created": "2010-09-12 07:19:31",

6
apps/addons/fixtures/addons/addon_228107_multiple-devs.json
Просмотреть файл

@ -254,14 +254,11 @@
"username": "theauthor1",
"bio": 13252970,
"failed_login_attempts": 0,
"firstname": "",
"deleted": false,
"lastname": "",
"emailhidden": false,
"last_login_attempt_ip": "",
"last_login_attempt": null,
"password": "nope",
"nickname": "theauthor",
"resetcode_expires": null,
"resetcode": "",
"created": "2010-09-12 07:19:31",
@ -290,14 +287,11 @@
"username": "theauthor2",
"bio": 13252971,
"failed_login_attempts": 0,
"firstname": "",
"deleted": false,
"lastname": "",
"emailhidden": false,
"last_login_attempt_ip": "",
"last_login_attempt": null,
"password": "nope",
"nickname": "theauthor2",
"resetcode_expires": null,
"resetcode": "",
"created": "2010-09-12 07:19:31",

3
apps/amo/fixtures/base/337141-steamcube.json
Просмотреть файл

@ -165,13 +165,10 @@
"email": "steamcube@mozilla.com",
"location": "",
"bio": null,
"firstname": "Leet",
"deleted": false,
"lastname": "User",
"emailhidden": true,
"user": 31337,
"password": "sha512$7b5436061f8c0902088c292c057be69fdb17312e2f71607c9c51641f5d876522$08d1d370d89e2ae92755fd03464a7276ca607c431d04a52d659f7a184f3f9918073637d82fc88981c7099c7c46a1137b9fdeb675304eb98801038905a9ee0600",
"nickname": "31337",
"username": "31337",
"display_name": "31337 \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": null,

3
apps/amo/fixtures/base/addon_10423_youtubesearch.json
Просмотреть файл

@ -184,14 +184,11 @@
"username": "ditman",
"bio": null,
"failed_login_attempts": 0,
"firstname": "David",
"deleted": false,
"lastname": "Iglesias",
"emailhidden": true,
"last_login_attempt_ip": "",
"last_login_attempt": null,
"password": "",
"nickname": "ditman",
"resetcode_expires": null,
"resetcode": "",
"created": "2009-01-19 15:19:21",

3
apps/amo/fixtures/base/addon_1833_yoono.json
Просмотреть файл

@ -144,14 +144,11 @@
"username": "9250",
"bio": null,
"failed_login_attempts": 0,
"firstname": "Yoono",
"deleted": false,
"lastname": "",
"emailhidden": true,
"last_login_attempt_ip": "",
"last_login_attempt": null,
"password": "sha512$308d46cdaf22e72f733811461a8ec6f99b6f5ff61f000096f4183009923fecd8$0b7d13e659492aca20eaada963bd2f77152ab83da9bbee750dee1f5b8789059e97a0db57e7ec13840e275932614fad8f805e76cc8411d6c847bcdb6a9e142fb8",
"nickname": "9250",
"resetcode_expires": null,
"resetcode": "",
"created": "2007-03-05 13:09:37",

3
apps/amo/fixtures/base/addon_3615.json
Просмотреть файл

@ -290,13 +290,10 @@
"email": "del@icio.us",
"location": "",
"bio": null,
"firstname": "Yahoo!",
"deleted": false,
"lastname": "Inc.",
"emailhidden": true,
"user": 55021,
"password": "sha512$7b5436061f8c0902088c292c057be69fdb17312e2f71607c9c51641f5d876522$08d1d370d89e2ae92755fd03464a7276ca607c431d04a52d659f7a184f3f9918073637d82fc88981c7099c7c46a1137b9fdeb675304eb98801038905a9ee0600",
"nickname": "55021",
"username": "55021",
"display_name": "55021 \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": null,

3
apps/amo/fixtures/base/addon_3723_listed.json
Просмотреть файл

@ -109,13 +109,10 @@
"email": "dd+b2f47812c@davedash.com",
"location": "",
"bio": null,
"firstname": "kozakura",
"deleted": false,
"lastname": "",
"emailhidden": true,
"user": 8735,
"password": "",
"nickname": "8735",
"username": "8735",
"display_name": "8735 \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": null,

3
apps/amo/fixtures/base/addon_40.json
Просмотреть файл

@ -109,13 +109,10 @@
"email": "dd+b565d0324@davedash.com",
"location": "",
"bio": null,
"firstname": "Tomas",
"deleted": false,
"lastname": "Styblo",
"emailhidden": true,
"user": null,
"password": "",
"nickname": "41",
"username": "41",
"display_name": "41 \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": null,

3
apps/amo/fixtures/base/addon_4594_a9.json
Просмотреть файл

@ -153,13 +153,10 @@
"homepage": "http://micropipes.com/blog/",
"email": "dd+5dc5f88b0@davedash.com",
"location": "Portland, OR",
"firstname": "Wil",
"deleted": false,
"lastname": "Clouser",
"emailhidden": false,
"user": 10482,
"password": "",
"nickname": "clouserw",
"username": "clouserw",
"display_name": "clouserw \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": null,

3
apps/amo/fixtures/base/addon_4664_twitterbar.json
Просмотреть файл

@ -211,13 +211,10 @@
"email": "dd+357b3dde1@davedash.com",
"location": "Minneapolis, MN",
"bio": null,
"firstname": "Christopher",
"deleted": false,
"lastname": "Finke",
"emailhidden": false,
"user": 2519,
"password": "",
"nickname": "cfinke",
"username": "cfinke",
"display_name": "cfinke \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": null,

3
apps/amo/fixtures/base/addon_5299_gcal.json
Просмотреть файл

@ -168,13 +168,10 @@
"homepage": "http://ginatrapani.org",
"email": "g@gmail.com",
"location": "",
"firstname": "Gina",
"deleted": false,
"lastname": "Trapani",
"emailhidden": true,
"user": 60582,
"password": "sha512$7b5436061f8c0902088c292c057be69fdb17312e2f71607c9c51641f5d876522$08d1d370d89e2ae92755fd03464a7276ca607c431d04a52d659f7a184f3f9918073637d82fc88981c7099c7c46a1137b9fdeb675304eb98801038905a9ee0600",
"nickname": "60582",
"username": "60582",
"display_name": "60582 \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": null,

3
apps/amo/fixtures/base/addon_5369.json
Просмотреть файл

@ -130,13 +130,10 @@
"email": "dd+0cb167b90@davedash.com",
"location": "",
"bio": null,
"firstname": "Yahoo!",
"deleted": false,
"lastname": "Inc.",
"emailhidden": true,
"user": 55021,
"password": "",
"nickname": "55021",
"username": "55021",
"display_name": "55021 \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": null,

3
apps/amo/fixtures/base/addon_5579.json
Просмотреть файл

@ -157,13 +157,10 @@
"email": "dd+4edd7c76d@davedash.com",
"location": "",
"bio": null,
"firstname": "The Cooliris",
"deleted": false,
"lastname": "Team",
"emailhidden": false,
"user": 9873,
"password": "",
"nickname": "9873",
"username": "9873",
"display_name": "9873 \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": null,

3
apps/amo/fixtures/base/addon_592.json
Просмотреть файл

@ -129,13 +129,10 @@
"email": "dd+5e83a56fe@davedash.com",
"location": "",
"bio": null,
"firstname": "Richard",
"deleted": false,
"lastname": "Jones",
"emailhidden": true,
"user": null,
"password": "",
"nickname": "802",
"username": "802",
"display_name": "802 \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": null,

3
apps/amo/fixtures/base/addon_6113.json
Просмотреть файл

@ -107,13 +107,10 @@
"email": "dd+79ba60f98@davedash.com",
"location": "",
"bio": null,
"firstname": "softcup",
"deleted": false,
"lastname": "",
"emailhidden": false,
"user": null,
"password": "",
"nickname": "softcup",
"username": "softcup",
"display_name": "softcup \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": null,

3
apps/amo/fixtures/base/addon_6704_grapple.json
Просмотреть файл

@ -117,13 +117,10 @@
"email": "dd+50b9da4b9@davedash.com",
"location": "",
"bio": null,
"firstname": "Aronnax",
"deleted": false,
"lastname": "G.",
"emailhidden": false,
"user": null,
"password": "",
"nickname": "Aronnax",
"username": "Aronnax",
"display_name": "Aronnax",
"resetcode_expires": null,

3
apps/amo/fixtures/base/addon_9825_fastestfox.json
Просмотреть файл

@ -122,14 +122,11 @@
"location": "",
"username": "2837503",
"failed_login_attempts": 0,
"firstname": "Yongqian",
"deleted": false,
"lastname": "Li",
"emailhidden": true,
"last_login_attempt_ip": "",
"last_login_attempt": null,
"password": "sha512$7c1747867a3b658604f17ee0c954476015de60828308e09562f7dbbd75788bda$45dbe9945da644d4e1df6eb39c79ffb0a79d8f8a80b388a47d99384cd55c6cc4f0d2c67d09d5067dd64e05230aabac319c7c51b7365b9c5ff4cde0ffb598b59b",
"nickname": "yongqli",
"resetcode_expires": null,
"resetcode": "",
"created": "2008-10-02 20:21:49",

3
apps/amo/fixtures/base/addon_personas-plus.json
Просмотреть файл

@ -278,13 +278,10 @@
"username": "_user_5133025",
"bio": 768006,
"failed_login_attempts": 0,
"firstname": "",
"deleted": false,
"lastname": "",
"emailhidden": true,
"last_login_attempt_ip": "",
"password": "",
"nickname": "Mozilla Labs",
"resetcode_expires": "2011-03-09 14:33:41",
"resetcode": "",
"created": "2010-01-20 17:15:56",

3
apps/amo/fixtures/base/addontag.json
Просмотреть файл

@ -38,13 +38,10 @@
"email": "4043307@yermom.com",
"notifycompat": 1,
"bio": null,
"firstname": "Andrew",
"deleted": 0,
"lastname": "Remennikov",
"emailhidden": 1,
"user": null,
"password": "yermom",
"nickname": "Wink-RU",
"username": "Wink-RU",
"display_name": "Wink-RU \u0627\u0644\u062a\u0637\u0628",
"resetcode": "",

3
apps/amo/fixtures/base/admin.json
Просмотреть файл

@ -32,13 +32,10 @@
"email": "jbalogh@mozilla.com",
"notifycompat": 1,
"bio": null,
"firstname": "Jeff",
"deleted": 0,
"lastname": "Balogh",
"emailhidden": 0,
"user": 4043307,
"password": "sha512$7b5436061f8c0902088c292c057be69fdb17312e2f71607c9c51641f5d876522$08d1d370d89e2ae92755fd03464a7276ca607c431d04a52d659f7a184f3f9918073637d82fc88981c7099c7c46a1137b9fdeb675304eb98801038905a9ee0600",
"nickname": "jbalogh",
"username": "jbalogh",
"resetcode_expires": "2010-01-12 15:28:07",
"resetcode": "",

2
apps/amo/fixtures/base/collection_57181.json
Просмотреть файл

@ -14,9 +14,7 @@
"email": "dd+fe1175df5@davedash.com",
"notifycompat": true,
"bio": null,
"firstname": "denis",
"deleted": false,
"lastname": "smailin",
"emailhidden": true,
"user": null,
"password": "",

3
apps/amo/fixtures/base/user_2519.json
Просмотреть файл

@ -32,13 +32,10 @@
"email": "dd+357b3dde1@davedash.com",
"notifycompat": true,
"bio": null,
"firstname": "Christopher",
"deleted": false,
"lastname": "Finke",
"emailhidden": false,
"user": 2519,
"password": "",
"nickname": "cfinke",
"username": "cfinke",
"display_name": "cfinke \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": null,

3
apps/amo/fixtures/base/user_4043307.json
Просмотреть файл

@ -32,13 +32,10 @@
"email": "dd+605fa45e4@davedash.com",
"notifycompat": true,
"bio": null,
"firstname": "Jeff",
"deleted": false,
"lastname": "Balogh",
"emailhidden": false,
"user": 4043307,
"password": "",
"nickname": "jbalogh",
"username": "jbalogh",
"display_name": "jbalogh \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": null,

13
apps/amo/fixtures/base/users.json
Просмотреть файл

@ -30,12 +30,9 @@
"email": "regular@mozilla.com",
"notifycompat": 1,
"bio": null,
"firstname": "Regular",
"deleted": 0,
"lastname": "User",
"emailhidden": 0,
"password": "sha512$7b5436061f8c0902088c292c057be69fdb17312e2f71607c9c51641f5d876522$08d1d370d89e2ae92755fd03464a7276ca607c431d04a52d659f7a184f3f9918073637d82fc88981c7099c7c46a1137b9fdeb675304eb98801038905a9ee0600",
"nickname": "regularuser",
"username": "regularuser",
"display_name": "regularuser \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": "2010-01-12 15:28:07",
@ -82,13 +79,10 @@
"email": "clouserw@gmail.com",
"location": "Portland, OR",
"bio": 480997,
"firstname": "Wil",
"deleted": 0,
"lastname": "Clouser",
"emailhidden": 0,
"user": 10482,
"password": "sha512$7b5436061f8c0902088c292c057be69fdb17312e2f71607c9c51641f5d876522$08d1d370d89e2ae92755fd03464a7276ca607c431d04a52d659f7a184f3f9918073637d82fc88981c7099c7c46a1137b9fdeb675304eb98801038905a9ee0600",
"nickname": "clouserw",
"username": "clouserw",
"display_name": "clouserw \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": "2010-01-01 00:00:00",
@ -131,13 +125,10 @@
"email": "admin@mozilla.com",
"notifycompat": 1,
"bio": null,
"firstname": "Jeff",
"deleted": 0,
"lastname": "Balogh",
"emailhidden": 0,
"user": 4043307,
"password": "sha512$7b5436061f8c0902088c292c057be69fdb17312e2f71607c9c51641f5d876522$08d1d370d89e2ae92755fd03464a7276ca607c431d04a52d659f7a184f3f9918073637d82fc88981c7099c7c46a1137b9fdeb675304eb98801038905a9ee0600",
"nickname": "admin",
"username": "admin",
"display_name": "admin \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": "2010-01-12 15:28:07",
@ -182,7 +173,6 @@
"last_login_attempt_ip": "127.0.0.1",
"last_login_attempt": "2010-11-16 10:51:34",
"password": "sha512$7b5436061f8c0902088c292c057be69fdb17312e2f71607c9c51641f5d876522$08d1d370d89e2ae92755fd03464a7276ca607c431d04a52d659f7a184f3f9918073637d82fc88981c7099c7c46a1137b9fdeb675304eb98801038905a9ee0600",
"nickname": "editor",
"resetcode_expires": "2010-10-19 13:02:25",
"created": "2010-10-19 13:02:25",
"modified": "2010-11-16 10:51:34",
@ -228,14 +218,11 @@
"username": "partner",
"bio": null,
"failed_login_attempts": 0,
"firstname": "",
"deleted": false,
"lastname": "",
"emailhidden": true,
"last_login_attempt_ip": "",
"last_login_attempt": null,
"password": "",
"nickname": "partner",
"resetcode_expires": null,
"resetcode": "",
"created": "2011-12-01 16:20:55",

3
apps/cake/fixtures/cake/sessions.json
Просмотреть файл

@ -3,11 +3,8 @@
"pk": 1,
"model": "users.userprofile",
"fields": {
"nickname": "fligtard",
"username": "fligtard",
"display_name": "Scott \u0627\u0644\u062a\u0637\u0628",
"firstname": "Scott",
"lastname": "Bakula",
"emailhidden": 1,
"display_collections": 1,
"display_collections_fav": 1,

3
apps/devhub/fixtures/devhub/addon-file-100456.json
Просмотреть файл

@ -154,13 +154,10 @@
"email": "del@icio.us",
"location": "",
"bio": null,
"firstname": "Yahoo!",
"deleted": false,
"lastname": "Inc.",
"emailhidden": true,
"user": 55021,
"password": "sha512$7b5436061f8c0902088c292c057be69fdb17312e2f71607c9c51641f5d876522$08d1d370d89e2ae92755fd03464a7276ca607c431d04a52d659f7a184f3f9918073637d82fc88981c7099c7c46a1137b9fdeb675304eb98801038905a9ee0600",
"nickname": "55021",
"username": "55021",
"display_name": "55021 \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": null,

3
apps/devhub/fixtures/devhub/addon-validation-1.json
Просмотреть файл

@ -154,13 +154,10 @@
"email": "del@icio.us",
"location": "",
"bio": null,
"firstname": "Yahoo!",
"deleted": false,
"lastname": "Inc.",
"emailhidden": true,
"user": 55021,
"password": "sha512$7b5436061f8c0902088c292c057be69fdb17312e2f71607c9c51641f5d876522$08d1d370d89e2ae92755fd03464a7276ca607c431d04a52d659f7a184f3f9918073637d82fc88981c7099c7c46a1137b9fdeb675304eb98801038905a9ee0600",
"nickname": "55021",
"username": "55021",
"display_name": "55021 \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": null,

6
apps/reviews/feeds.py
Просмотреть файл

@ -66,11 +66,7 @@ class ReviewsRss(Feed):
def item_author_name(self, review):
"""Author for a particuar review (<item><dc:creator>)"""
user = review.user
if user.username:
return user.username.strip()
else:
return '%s %s' % (user.firstname.strip(), user.lastname.strip())
return review.user.name
def item_pubdate(self, review):
"""Pubdate for a particuar review (<item><pubDate>)"""

6
apps/reviews/fixtures/reviews/dev-reply.json
Просмотреть файл

@ -56,13 +56,10 @@
"email": "root_x@ukr.net",
"notifycompat": true,
"bio": null,
"firstname": "povierennyy",
"deleted": false,
"lastname": "",
"emailhidden": false,
"user": 5293223,
"password": "sha512$7b5436061f8c0902088c292c057be69fdb17312e2f71607c9c51641f5d876522$08d1d370d89e2ae92755fd03464a7276ca607c431d04a52d659f7a184f3f9918073637d82fc88981c7099c7c46a1137b9fdeb675304eb98801038905a9ee0600",
"nickname": "root_x",
"username": "root_x",
"resetcode_expires": null,
"resetcode": "",
@ -137,13 +134,10 @@
"email": "trev@adblockplus.org",
"notifycompat": true,
"bio": null,
"firstname": "Wladimir",
"deleted": false,
"lastname": "Palant",
"emailhidden": false,
"user": 346,
"password": "sha512$7b5436061f8c0902088c292c057be69fdb17312e2f71607c9c51641f5d876522$08d1d370d89e2ae92755fd03464a7276ca607c431d04a52d659f7a184f3f9918073637d82fc88981c7099c7c46a1137b9fdeb675304eb98801038905a9ee0600",
"nickname": "Wladimir Palant",
"username": "Wladimir Palant",
"resetcode_expires": null,
"resetcode": "",

3
apps/reviews/fixtures/reviews/test_models.json
Просмотреть файл

@ -36,11 +36,8 @@
"pk": 1,
"model": "users.userprofile",
"fields": {
"firstname": "",
"created": "2009-10-19 06:21:02",
"lastname": "",
"modified": "2009-10-19 06:21:02",
"nickname": "nobody",
"username": "nobody",
"email": "nobody@mozilla.org"
}

3
apps/reviews/fixtures/reviews/three-reviews.json
Просмотреть файл

@ -109,14 +109,11 @@
"homepage": "",
"email": "happyreader@gmx.net",
"notifycompat": 1,
"firstname": "h",
"deleted": 0,
"lastname": "willems",
"emailhidden": 1,
"user": null,
"bio": null,
"password": "sha512$280a921ec6e735ec6a1a76dc8802f3f6aee254f3fd71589010fe85ebce185f7a$c797ddde00731d7660b9e0c887d77b373e782eaa949e6101f17ada9a7236c426db53ac4344c133cdf32e73381bb7c7280efe5fdc5dd6134bbd2f706d994f94ff",
"nickname": "Join2",
"username": "Join2",
"resetcode_expires": null,
"resetcode": "",

2
apps/reviews/tests/test_feeds.py
Просмотреть файл

@ -25,8 +25,6 @@ class FeedTest(amo.tests.TestCase):
self.user = mock.Mock()
self.user.username = None
self.user.firstname = self.u
self.user.lastname = self.u
self.review = mock.Mock()
self.review.title = self.wut

2
apps/stats/fixtures/stats/test_views.json
Просмотреть файл

@ -15,7 +15,6 @@
"pk": 4043307,
"model": "users.userprofile",
"fields": {
"nickname": "jbalogh",
"username": "jbalogh",
"deleted": 0,
"user": 4043307,
@ -39,7 +38,6 @@
"pk": 8675309,
"model": "users.userprofile",
"fields": {
"nickname": "nobodyspecial",
"username": "nobodyspecial",
"deleted": 0,
"user": 8675309,

12
apps/users/fixtures/users/test_backends.json
Просмотреть файл

@ -32,13 +32,10 @@
"email": "jbalogh@mozilla.com",
"notifycompat": 1,
"bio": null,
"firstname": "Jeff",
"deleted": 0,
"lastname": "Balogh",
"emailhidden": 0,
"user": 4043307,
"password": "sha512$32e15df727a054aa56cf69accc142d1573372641a176aab9b0f1458e27dc6f3b$5bd3bd7811569776a07fbbb5e50156aa6ebdd0bec9267249b57da065340f0324190f1ad0d5f609dca19179a86c64807e22f789d118e6f7109c95b9c64ae8f619",
"nickname": "jbalogh",
"username": "jbalogh",
"display_name": "Jeff Balogh \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": "2010-01-12 15:28:07",
@ -86,13 +83,10 @@
"email": "fligtar@gmail.com",
"notifycompat": 1,
"bio": null,
"firstname": "Justin",
"deleted": 0,
"lastname": "Scott",
"emailhidden": 1,
"user": 9945,
"password": "sha512$32e15df727a054aa56cf69accc142d1573372641a176aab9b0f1458e27dc6f3b$5bd3bd7811569776a07fbbb5e50156aa6ebdd0bec9267249b57da065340f0324190f1ad0d5f609dca19179a86c64807e22f789d118e6f7109c95b9c64ae8f619",
"nickname": "fligtar",
"username": "fligtar",
"display_name": "Justin Scott \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": "2010-01-12 15:28:07",
@ -137,13 +131,10 @@
"email": "testo@example.com",
"notifycompat": true,
"bio": 1124105,
"firstname": "Barry",
"deleted": false,
"lastname": "",
"emailhidden": false,
"user": 5349055,
"password": "sha512$9ec347fc67fc17c99a9dd43d1431a5959011acf247fb2128228c9a04208d1991$edcc677c7045ee2a379286e2ad6d99bd58af6b4a2117e1e4c2743923a9a297ce56d5311fe51baa4584c5483af0eaedc57700fbb4b719c0a84597c1609536ca4d",
"nickname": "barry",
"username": "barry",
"display_name": "barry \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": "2010-07-23 00:37:10",
@ -187,13 +178,10 @@
"email": "alice@example.com",
"notifycompat": 1,
"bio": null,
"firstname": "Alice",
"deleted": 0,
"lastname": "Smith",
"emailhidden": 1,
"user": null,
"password": "sha512$32e15df727a054aa56cf69accc142d1573372641a176aab9b0f1458e27dc6f3b$5bd3bd7811569776a07fbbb5e50156aa6ebdd0bec9267249b57da065340f0324190f1ad0d5f609dca19179a86c64807e22f789d118e6f7109c95b9c64ae8f619",
"nickname": "alice",
"username": "alice",
"display_name": "Alice Smith \u0627\u0644\u062a\u0637\u0628",
"resetcode_expires": "2010-01-12 15:28:07",

2
apps/users/forms.py
Просмотреть файл

@ -370,7 +370,7 @@ class BaseAdminUserEditForm(object):
def changed_fields(self):
"""Returns changed_data ignoring these fields."""
return (set(self.changed_data) -
set(['admin_log', 'nickname', 'notifications',
set(['admin_log', 'notifications',
'password', 'password2', 'oldpassword']))
def changes(self):

13
apps/users/models.py
Просмотреть файл

@ -93,12 +93,6 @@ class UserEmailField(forms.EmailField):
class UserProfile(amo.models.OnChangeMixin, amo.models.ModelBase):
# nickname, firstname, & lastname are deprecated.
nickname = models.CharField(max_length=255, default='', null=True,
blank=True)
firstname = models.CharField(max_length=255, default='', blank=True)
lastname = models.CharField(max_length=255, default='', blank=True)
username = models.CharField(max_length=255, default='', unique=True)
display_name = models.CharField(max_length=255, default='', null=True,
blank=True)
@ -245,9 +239,6 @@ class UserProfile(amo.models.OnChangeMixin, amo.models.ModelBase):
log.info(u"User (%s: <%s>) is being anonymized." % (self, self.email))
self.email = None
self.password = "sha512$Anonymous$Password"
self.firstname = ""
self.lastname = ""
self.nickname = None
self.username = "Anonymous-%s" % self.id # Can't be null
self.display_name = None
self.homepage = ""
@ -266,10 +257,6 @@ class UserProfile(amo.models.OnChangeMixin, amo.models.ModelBase):
if not self.resetcode_expires:
self.resetcode_expires = datetime.now()
# TODO POSTREMORA (maintain remora's view of user names.)
if not self.firstname or self.lastname or self.nickname:
self.nickname = self.name
delete_user = None
if self.deleted and self.user:
delete_user = self.user

1
apps/users/tests/test_views.py
Просмотреть файл

@ -309,7 +309,6 @@ class TestEditAdmin(UserViewBase):
def test_anonymize(self):
data = self.get_data()
data['anonymize'] = True
data['nickname'] = ''
res = self.client.post(self.url, data)
eq_(res.status_code, 302)
eq_(self.get_user().password, "sha512$Anonymous$Password")

6
apps/zadmin/fixtures/zadmin/tests/flagged.json
Просмотреть файл

@ -22,11 +22,8 @@
"pk": 4230,
"model": "users.userprofile",
"fields": {
"firstname": "Jorge",
"created": "2007-03-05 13:09:35",
"lastname": "Villalobos",
"modified": "2009-09-22 09:12:24",
"nickname": "jorge.villalobos",
"username": "jorge.villalobos",
"email": "jorge@mozilla.com"
}
@ -232,13 +229,10 @@
"email": "jbalogh@mozilla.com",
"notifycompat": 1,
"bio": null,
"firstname": "Jeff",
"deleted": 0,
"lastname": "Balogh",
"emailhidden": 0,
"user": 4043307,
"password": "sha512$7b5436061f8c0902088c292c057be69fdb17312e2f71607c9c51641f5d876522$08d1d370d89e2ae92755fd03464a7276ca607c431d04a52d659f7a184f3f9918073637d82fc88981c7099c7c46a1137b9fdeb675304eb98801038905a9ee0600",
"nickname": "jbalogh",
"username": "jbalogh",
"resetcode_expires": "2010-01-12 15:28:07",
"resetcode": "",