Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
JoinTheCity
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rafal
JoinTheCity
Commits
426b191b
Commit
426b191b
authored
Jan 17, 2016
by
Eryk Leniart
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitlab.telemabk.pl/vallher/JoinTheCity
parents
0583da2f
831f33a3
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
init_apis.py
JoinTheCityREST/app/API/management/commands/init_apis.py
+1
-1
models.py
JoinTheCityREST/app/Discussion/models.py
+2
-2
views.py
JoinTheCityREST/app/Discussion/views.py
+4
-1
pharmacy.png
JoinTheCityREST/media/image/pharmacy.png
+0
-0
No files found.
JoinTheCityREST/app/API/management/commands/init_apis.py
View file @
426b191b
...
@@ -11,7 +11,7 @@ class Command(BaseCommand):
...
@@ -11,7 +11,7 @@ class Command(BaseCommand):
def
handle
(
self
,
*
args
,
**
options
):
def
handle
(
self
,
*
args
,
**
options
):
apis
=
[
apis
=
[
[
'Apteki w Krakowie'
,
'Krakow'
,
'map'
,
'apteki'
,
'image/
icon.jpg'
,
'Opis API o aptekach w Krakowie
'
],
[
'Apteki w Krakowie'
,
'Krakow'
,
'map'
,
'apteki'
,
'image/
pharmacy.png'
,
'Wspolrzedne Aptek w miescie Krakow
'
],
[
'Baseny w Krakowie'
,
'Krakow'
,
'map'
,
'baseny'
,
'image/icon.jpg'
,
'Opis API o aptekach w Krakowie'
],
[
'Baseny w Krakowie'
,
'Krakow'
,
'map'
,
'baseny'
,
'image/icon.jpg'
,
'Opis API o aptekach w Krakowie'
],
[
'Hotele w Krakowie'
,
'Krakow'
,
'map'
,
'hotele'
,
'image/icon.jpg'
,
'Opis API o aptekach w Krakowie'
],
[
'Hotele w Krakowie'
,
'Krakow'
,
'map'
,
'hotele'
,
'image/icon.jpg'
,
'Opis API o aptekach w Krakowie'
],
#['HotSpoty w Krakowie', 'Krakow', 'map','mapaHotSpotow', 'image/icon.jpg', 'Opis API o aptekach w Krakowie'],
#['HotSpoty w Krakowie', 'Krakow', 'map','mapaHotSpotow', 'image/icon.jpg', 'Opis API o aptekach w Krakowie'],
...
...
JoinTheCityREST/app/Discussion/models.py
View file @
426b191b
...
@@ -23,8 +23,8 @@ class Discussion(models.Model):
...
@@ -23,8 +23,8 @@ class Discussion(models.Model):
def
__str__
(
self
):
def
__str__
(
self
):
return
self
.
question
return
self
.
question
def
add_message
(
self
,
user
,
text
):
def
add_message
(
self
,
user
,
text
=
""
):
message
=
TextMessage
.
objects
.
create
(
user
=
user
,
text
=
text
)
message
=
TextMessage
.
objects
.
create
(
user
=
user
,
text
=
text
)
message
.
save
()
message
.
save
()
self
.
message
s
.
add
(
message
)
self
.
message
.
add
(
message
)
self
.
save
()
self
.
save
()
\ No newline at end of file
JoinTheCityREST/app/Discussion/views.py
View file @
426b191b
...
@@ -16,10 +16,13 @@ class DiscussionViewSet(viewsets.ModelViewSet):
...
@@ -16,10 +16,13 @@ class DiscussionViewSet(viewsets.ModelViewSet):
serializer_class
=
DiscussionSerializer
serializer_class
=
DiscussionSerializer
permission_classes
=
(
permissions
.
IsAuthenticatedOrReadOnly
,)
permission_classes
=
(
permissions
.
IsAuthenticatedOrReadOnly
,)
@
detail_route
(
methods
=
[
'post'
])
@
detail_route
(
methods
=
[
'post'
]
,
permission_classes
=
[
permissions
.
AllowAny
]
)
def
add
(
self
,
request
,
pk
=
None
):
def
add
(
self
,
request
,
pk
=
None
):
discussion
=
get_object_or_404
(
self
.
queryset
,
pk
=
pk
)
discussion
=
get_object_or_404
(
self
.
queryset
,
pk
=
pk
)
text
=
request
.
data
.
get
(
'text'
)
text
=
request
.
data
.
get
(
'text'
)
print
"XD"
print
request
.
data
print
request
.
request
.
__dict__
user
=
request
.
user
user
=
request
.
user
discussion
.
add_message
(
text
=
text
,
user
=
user
)
discussion
.
add_message
(
text
=
text
,
user
=
user
)
return
Response
(
status
=
rest_framework
.
status
.
HTTP_200_OK
)
return
Response
(
status
=
rest_framework
.
status
.
HTTP_200_OK
)
...
...
JoinTheCityREST/media/image/pharmacy.png
0 → 100644
View file @
426b191b
6.05 KB
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