Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed whitespace, moved tests

  • Loading branch information...
commit b02a8f1d21ab9886f8d935a9e9a8fa947304a921 1 parent 7c14717
@kumar303 kumar303 authored
View
16 auth/models.py
@@ -33,17 +33,19 @@ class User(db.Model):
necessarily compatible. We only keep basic information about the
user here; essentially only things we need for "sysadmin-y" tasks.
More detailed information should go in the volunteer tracker or
- other
+ other
"""
email = db.EmailProperty(required=True)
first_name = db.StringProperty()
last_name = db.StringProperty()
+ # ID assigned by chirpradio.org via XML sync.
+ external_id = db.IntegerProperty()
dj_name = db.StringProperty(required=False)
-
+
# This is an index of searchable terms for the user. Used by autocomplete.
index = db.StringListProperty()
-
+
# This is the SHA1 hash of the user's password.
password = db.StringProperty()
# We omit Django's is_staff property.
@@ -63,7 +65,7 @@ class User(db.Model):
# expressions are equivalent:
# roles.ROLE_NAME in user.roles
# user.is_role_name
- #
+ #
# TODO(trow): Add validation that all roles are valid.
roles = db.StringListProperty()
@@ -144,7 +146,7 @@ class KeyStorage(db.Model):
"""Models a single entity that contains crypto keys."""
# Used to sign security tokens.
hmac_key = db.StringProperty(required=True)
-
+
# Used to encrypt security tokens.
aes_key = db.StringProperty(required=True)
@@ -165,6 +167,6 @@ def get(cls):
logging.warn('Created new KeyStorage containing test keys')
cls._cached = (ks, time.time())
return ks
-
-
+
+
View
0  auth/tests.py → auth/tests/test_views.py
File renamed without changes
View
26 djdb/urls.py
@@ -31,13 +31,13 @@
'',
# Landing page
url(r'^/?$', 'djdb.views.landing_page', name='djdb.landing_page'),
-
+
# Activity page
(r'activity', 'djdb.views.activity_page'),
-
+
# Reviews page
(r'reviews', 'djdb.views.reviews_page'),
-
+
# DJ home pgae
(r'user/?(.*)', 'djdb.views.user_info_page'),
@@ -61,7 +61,7 @@
# More flexible autocomplete search
url(r'track/search\.json', 'djdb.views.track_search',
name='djdb.views.track_search'),
-
+
# Album information page
(r'album/(.*)/info', 'djdb.views.album_info_page'),
@@ -83,7 +83,7 @@
(r'album/(.*)/unhide_review/(.*)', 'djdb.views.album_hide_unhide_review'),
(r'album/(.*)/delete_review/(.*)', 'djdb.views.album_delete_review'),
(r'album/(.*)/delete_review', 'djdb.views.album_delete_review'),
-
+
# Album comments.
(r'album/(.*)/new_comment', 'djdb.views.album_edit_comment'),
(r'album/(.*)/edit_comment/(.*)', 'djdb.views.album_edit_comment'),
@@ -91,27 +91,27 @@
(r'album/(.*)/unhide_comment/(.*)', 'djdb.views.album_hide_unhide_comment'),
(r'album/(.*)/delete_comment/(.*)', 'djdb.views.album_delete_comment'),
(r'album/(.*)/delete_comment', 'djdb.views.album_delete_comment'),
-
+
# Album tags.
(r'tags$', 'djdb.views.list_tags'),
(r'tags/new', 'djdb.views.new_tag'),
(r'tag/(.*)', 'djdb.views.edit_tag'),
(r'album/(.*)/add_tag', 'djdb.views.album_add_tag'),
(r'album/(.*)/remove_tag', 'djdb.views.album_remove_tag'),
-
+
# Album search for jquery.autocomplete
(r'album/search\.txt', 'djdb.views.album_search_for_autocomplete'),
-
+
# Browse the database.
(r'browse/(.+)/(.+)', 'djdb.views.browse_page'),
(r'new_browse', 'djdb.views.new_browse_page'),
# Album category page.
(r'category/(.*)', 'djdb.views.category_page'),
-
+
# Track search for jquery.autocomplete
(r'track/search\.txt', 'djdb.views.track_search_for_autocomplete'),
-
+
# Label search for jquery.autocomplete
(r'label/search\.txt', 'djdb.views.label_search_for_autocomplete'),
@@ -125,15 +125,15 @@
(r'crate/(.+)/remove_item', 'djdb.views.remove_crate_item'),
(r'crate/(.+)/reorder', 'djdb.views.reorder_crate_items'),
(r'^crate/(.*)', 'djdb.views.crate_page'),
-
+
(r'update/artists/bulk_add', 'djdb.views.artists_bulk_add'),
-
+
# Images
(IMAGE_URL_PATTERN, 'djdb.views.image'),
# Bootstrap -- development only!
(r'_bootstrap', 'djdb.bootstrap.bootstrap'),
-
+
(r'_copy_created', 'djdb.views._copy_created'),
# Web hook for index optimization
Please sign in to comment.
Something went wrong with that request. Please try again.