Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
friendfinderAPI
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
SRCT
friendfinderAPI
Commits
b13611bb
Commit
b13611bb
authored
Sep 02, 2014
by
Ben Waters
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adding user serializer
parent
0a54fbd3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
62 additions
and
26 deletions
+62
-26
.idea/dataSources.ids
.idea/dataSources.ids
+6
-0
.idea/dataSources.xml
.idea/dataSources.xml
+14
-0
.idea/workspace.xml
.idea/workspace.xml
+35
-26
core/models.py
core/models.py
+7
-0
No files found.
.idea/dataSources.ids
0 → 100644
View file @
b13611bb
<?xml version="1.0" encoding="UTF-8"?>
<component
name=
"dataSourceStorage"
>
<data-source
source=
"LOCAL"
name=
"Django default"
uuid=
"66f3b85e-5b04-4deb-9943-1d97d6c180a6"
>
<database-info
product=
""
version=
""
jdbc-version=
""
driver-name=
""
driver-version=
""
/>
</data-source>
</component>
\ No newline at end of file
.idea/dataSources.xml
0 → 100644
View file @
b13611bb
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"DataSourceManagerImpl"
format=
"xml"
hash=
"1006508842"
>
<data-source
source=
"LOCAL"
name=
"Django default"
uuid=
"66f3b85e-5b04-4deb-9943-1d97d6c180a6"
>
<driver-ref>
postgresql
</driver-ref>
<jdbc-driver>
org.postgresql.Driver
</jdbc-driver>
<jdbc-url>
jdbc:postgresql://127.0.0.1/ff
</jdbc-url>
<user-name>
ffuser
</user-name>
<user-password>
df9bdf9edfccdfccdf8b
</user-password>
<libraries
/>
</data-source>
</component>
</project>
.idea/workspace.xml
View file @
b13611bb
...
@@ -2,18 +2,8 @@
...
@@ -2,18 +2,8 @@
<project
version=
"4"
>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"d9cecc44-3001-4c5b-a72e-16df32873bd9"
name=
"Default"
comment=
""
>
<list
default=
"true"
id=
"d9cecc44-3001-4c5b-a72e-16df32873bd9"
name=
"Default"
comment=
""
>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/.idea/.name"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/core/models.py"
afterPath=
"$PROJECT_DIR$/core/models.py"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/.idea/encodings.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/.idea/friendfinder.iml"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/.idea/misc.xml"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/.idea/modules.xml"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/.idea/scopes/scope_settings.xml"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/.idea/vcs.xml"
/>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/geo/admin.py"
afterPath=
"$PROJECT_DIR$/geo/admin.py"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/geo/models.py"
afterPath=
"$PROJECT_DIR$/geo/models.py"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/ffREST/urls.py"
afterPath=
"$PROJECT_DIR$/ffREST/urls.py"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/geo/views.py"
afterPath=
"$PROJECT_DIR$/geo/views.py"
/>
</list>
</list>
<ignored
path=
"friendfinder.iws"
/>
<ignored
path=
"friendfinder.iws"
/>
<ignored
path=
".idea/workspace.xml"
/>
<ignored
path=
".idea/workspace.xml"
/>
...
@@ -43,8 +33,8 @@
...
@@ -43,8 +33,8 @@
<file
leaf-file-name=
"models.py"
pinned=
"false"
current=
"false"
current-in-tab=
"false"
>
<file
leaf-file-name=
"models.py"
pinned=
"false"
current=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/geo/models.py"
>
<entry
file=
"file://$PROJECT_DIR$/geo/models.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
vertical-scroll-proportion=
"0.0"
vertical-offset=
"
0"
max-vertical-offset=
"360
"
>
<state
vertical-scroll-proportion=
"0.0"
vertical-offset=
"
15"
max-vertical-offset=
"405
"
>
<caret
line=
"
1"
column=
"0"
selection-start-line=
"1"
selection-start-column=
"0"
selection-end-line=
"1
"
selection-end-column=
"0"
/>
<caret
line=
"
2"
column=
"0"
selection-start-line=
"2"
selection-start-column=
"0"
selection-end-line=
"2
"
selection-end-column=
"0"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
...
@@ -53,8 +43,8 @@
...
@@ -53,8 +43,8 @@
<file
leaf-file-name=
"views.py"
pinned=
"false"
current=
"false"
current-in-tab=
"false"
>
<file
leaf-file-name=
"views.py"
pinned=
"false"
current=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/geo/views.py"
>
<entry
file=
"file://$PROJECT_DIR$/geo/views.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
vertical-scroll-proportion=
"0.0"
vertical-offset=
"
0"
max-vertical-offset=
"300
"
>
<state
vertical-scroll-proportion=
"0.0"
vertical-offset=
"
135"
max-vertical-offset=
"435
"
>
<caret
line=
"
13"
column=
"0"
selection-start-line=
"13"
selection-start-column=
"0"
selection-end-line=
"13
"
selection-end-column=
"0"
/>
<caret
line=
"
22"
column=
"0"
selection-start-line=
"22"
selection-start-column=
"0"
selection-end-line=
"22
"
selection-end-column=
"0"
/>
<folding>
<folding>
<element
signature=
"e#0#35#0"
expanded=
"true"
/>
<element
signature=
"e#0#35#0"
expanded=
"true"
/>
</folding>
</folding>
...
@@ -62,10 +52,10 @@
...
@@ -62,10 +52,10 @@
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"urls.py"
pinned=
"false"
current=
"
true"
current-in-tab=
"tru
e"
>
<file
leaf-file-name=
"urls.py"
pinned=
"false"
current=
"
false"
current-in-tab=
"fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/ffREST/urls.py"
>
<entry
file=
"file://$PROJECT_DIR$/ffREST/urls.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
vertical-scroll-proportion=
"0.
24336283"
vertical-offset=
"0"
max-vertical-offset=
"678
"
>
<state
vertical-scroll-proportion=
"0.
0"
vertical-offset=
"0"
max-vertical-offset=
"450
"
>
<caret
line=
"11"
column=
"45"
selection-start-line=
"11"
selection-start-column=
"45"
selection-end-line=
"11"
selection-end-column=
"45"
/>
<caret
line=
"11"
column=
"45"
selection-start-line=
"11"
selection-start-column=
"45"
selection-end-line=
"11"
selection-end-column=
"45"
/>
<folding>
<folding>
<element
signature=
"e#0#51#0"
expanded=
"true"
/>
<element
signature=
"e#0#51#0"
expanded=
"true"
/>
...
@@ -74,13 +64,23 @@
...
@@ -74,13 +64,23 @@
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"models.py"
pinned=
"false"
current=
"true"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/core/models.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
vertical-scroll-proportion=
"0.15486726"
vertical-offset=
"0"
max-vertical-offset=
"678"
>
<caret
line=
"7"
column=
"38"
selection-start-line=
"7"
selection-start-column=
"38"
selection-end-line=
"7"
selection-end-column=
"38"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"admin.py"
pinned=
"false"
current=
"false"
current-in-tab=
"false"
>
<file
leaf-file-name=
"admin.py"
pinned=
"false"
current=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/geo/admin.py"
>
<entry
file=
"file://$PROJECT_DIR$/geo/admin.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
vertical-scroll-proportion=
"0.0"
vertical-offset=
"0"
max-vertical-offset=
"210"
>
<state
vertical-scroll-proportion=
"0.0"
vertical-offset=
"0"
max-vertical-offset=
"210"
>
<caret
line=
"7"
column=
"44"
selection-start-line=
"7"
selection-start-column=
"44"
selection-end-line=
"7"
selection-end-column=
"44"
/>
<caret
line=
"7"
column=
"44"
selection-start-line=
"7"
selection-start-column=
"44"
selection-end-line=
"7"
selection-end-column=
"44"
/>
<folding>
<folding>
<element
signature=
"e#0#3
2
#0"
expanded=
"true"
/>
<element
signature=
"e#0#3
6
#0"
expanded=
"true"
/>
</folding>
</folding>
</state>
</state>
</provider>
</provider>
...
@@ -103,6 +103,7 @@
...
@@ -103,6 +103,7 @@
<option
value=
"$PROJECT_DIR$/geo/admin.py"
/>
<option
value=
"$PROJECT_DIR$/geo/admin.py"
/>
<option
value=
"$PROJECT_DIR$/geo/views.py"
/>
<option
value=
"$PROJECT_DIR$/geo/views.py"
/>
<option
value=
"$PROJECT_DIR$/ffREST/urls.py"
/>
<option
value=
"$PROJECT_DIR$/ffREST/urls.py"
/>
<option
value=
"$PROJECT_DIR$/core/models.py"
/>
</list>
</list>
</option>
</option>
</component>
</component>
...
@@ -118,7 +119,7 @@
...
@@ -118,7 +119,7 @@
<OptionsSetting
value=
"true"
id=
"Update"
/>
<OptionsSetting
value=
"true"
id=
"Update"
/>
<OptionsSetting
value=
"true"
id=
"Status"
/>
<OptionsSetting
value=
"true"
id=
"Status"
/>
<OptionsSetting
value=
"true"
id=
"Edit"
/>
<OptionsSetting
value=
"true"
id=
"Edit"
/>
<ConfirmationsSetting
value=
"
0
"
id=
"Add"
/>
<ConfirmationsSetting
value=
"
1
"
id=
"Add"
/>
<ConfirmationsSetting
value=
"0"
id=
"Remove"
/>
<ConfirmationsSetting
value=
"0"
id=
"Remove"
/>
</component>
</component>
<component
name=
"ProjectReloadState"
>
<component
name=
"ProjectReloadState"
>
...
@@ -336,23 +337,23 @@
...
@@ -336,23 +337,23 @@
<state
vertical-scroll-proportion=
"0.0"
vertical-offset=
"0"
max-vertical-offset=
"210"
>
<state
vertical-scroll-proportion=
"0.0"
vertical-offset=
"0"
max-vertical-offset=
"210"
>
<caret
line=
"7"
column=
"44"
selection-start-line=
"7"
selection-start-column=
"44"
selection-end-line=
"7"
selection-end-column=
"44"
/>
<caret
line=
"7"
column=
"44"
selection-start-line=
"7"
selection-start-column=
"44"
selection-end-line=
"7"
selection-end-column=
"44"
/>
<folding>
<folding>
<element
signature=
"e#0#3
2
#0"
expanded=
"true"
/>
<element
signature=
"e#0#3
6
#0"
expanded=
"true"
/>
</folding>
</folding>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/geo/models.py"
>
<entry
file=
"file://$PROJECT_DIR$/geo/models.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
vertical-scroll-proportion=
"0.0"
vertical-offset=
"
0"
max-vertical-offset=
"360
"
>
<state
vertical-scroll-proportion=
"0.0"
vertical-offset=
"
15"
max-vertical-offset=
"405
"
>
<caret
line=
"
1"
column=
"0"
selection-start-line=
"1"
selection-start-column=
"0"
selection-end-line=
"1
"
selection-end-column=
"0"
/>
<caret
line=
"
2"
column=
"0"
selection-start-line=
"2"
selection-start-column=
"0"
selection-end-line=
"2
"
selection-end-column=
"0"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/geo/views.py"
>
<entry
file=
"file://$PROJECT_DIR$/geo/views.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
vertical-scroll-proportion=
"0.0"
vertical-offset=
"
0"
max-vertical-offset=
"300
"
>
<state
vertical-scroll-proportion=
"0.0"
vertical-offset=
"
135"
max-vertical-offset=
"435
"
>
<caret
line=
"
13"
column=
"0"
selection-start-line=
"13"
selection-start-column=
"0"
selection-end-line=
"13
"
selection-end-column=
"0"
/>
<caret
line=
"
22"
column=
"0"
selection-start-line=
"22"
selection-start-column=
"0"
selection-end-line=
"22
"
selection-end-column=
"0"
/>
<folding>
<folding>
<element
signature=
"e#0#35#0"
expanded=
"true"
/>
<element
signature=
"e#0#35#0"
expanded=
"true"
/>
</folding>
</folding>
...
@@ -361,7 +362,7 @@
...
@@ -361,7 +362,7 @@
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/ffREST/urls.py"
>
<entry
file=
"file://$PROJECT_DIR$/ffREST/urls.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
vertical-scroll-proportion=
"0.
24336283"
vertical-offset=
"0"
max-vertical-offset=
"678
"
>
<state
vertical-scroll-proportion=
"0.
0"
vertical-offset=
"0"
max-vertical-offset=
"450
"
>
<caret
line=
"11"
column=
"45"
selection-start-line=
"11"
selection-start-column=
"45"
selection-end-line=
"11"
selection-end-column=
"45"
/>
<caret
line=
"11"
column=
"45"
selection-start-line=
"11"
selection-start-column=
"45"
selection-end-line=
"11"
selection-end-column=
"45"
/>
<folding>
<folding>
<element
signature=
"e#0#51#0"
expanded=
"true"
/>
<element
signature=
"e#0#51#0"
expanded=
"true"
/>
...
@@ -369,6 +370,14 @@
...
@@ -369,6 +370,14 @@
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/core/models.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
vertical-scroll-proportion=
"0.15486726"
vertical-offset=
"0"
max-vertical-offset=
"678"
>
<caret
line=
"7"
column=
"38"
selection-start-line=
"7"
selection-start-column=
"38"
selection-end-line=
"7"
selection-end-column=
"38"
/>
<folding
/>
</state>
</provider>
</entry>
</component>
</component>
</project>
</project>
core/models.py
View file @
b13611bb
...
@@ -5,8 +5,15 @@ from django.contrib.auth import get_user_model
...
@@ -5,8 +5,15 @@ from django.contrib.auth import get_user_model
from
django.db.models.signals
import
post_save
from
django.db.models.signals
import
post_save
from
django.dispatch
import
receiver
from
django.dispatch
import
receiver
from
rest_framework.authtoken.models
import
Token
from
rest_framework.authtoken.models
import
Token
from
rest_framework
import
serializers
from
django.contrib.auth.models
import
User
@
receiver
(
post_save
,
sender
=
get_user_model
())
@
receiver
(
post_save
,
sender
=
get_user_model
())
def
create_auth_token
(
sender
,
instance
=
None
,
created
=
False
,
**
kwargs
):
def
create_auth_token
(
sender
,
instance
=
None
,
created
=
False
,
**
kwargs
):
if
created
:
if
created
:
Token
.
objects
.
create
(
user
=
instance
)
Token
.
objects
.
create
(
user
=
instance
)
class
UserSerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
User
fields
=
(
'id'
,
'username'
,
'email'
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment