Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
a0cf9380
authored
Apr 19, 2016
by
Fukász Rómeó Ervin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small code changes in core and views
parent
788d4f38
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
circle/occi/occi_core.py
+1
-1
circle/occi/views.py
+4
-3
No files found.
circle/occi/occi_core.py
View file @
a0cf9380
...
@@ -166,7 +166,7 @@ class Link(Entity):
...
@@ -166,7 +166,7 @@ class Link(Entity):
kwargs
)
kwargs
)
def
render_as_json
(
self
):
def
render_as_json
(
self
):
json
=
{
"kind"
:
self
.
kind
,
"id"
:
self
.
id
,
"source"
:
self
.
source
,
json
=
{
"kind"
:
self
.
kind
,
"id"
:
self
.
id
,
"source"
:
self
.
source
,
"target"
:
self
.
target
}
"target"
:
self
.
target
}
if
hasattr
(
self
,
"mixins"
):
if
hasattr
(
self
,
"mixins"
):
json
[
"mixins"
]
=
self
.
mixins
json
[
"mixins"
]
=
self
.
mixins
...
...
circle/occi/views.py
View file @
a0cf9380
...
@@ -4,9 +4,9 @@
...
@@ -4,9 +4,9 @@
from
django.views.generic
import
View
from
django.views.generic
import
View
from
django.contrib.auth
import
logout
from
django.contrib.auth
import
logout
from
django.http
import
HttpResponse
,
JsonResponse
from
django.http
import
JsonResponse
from
vm.models.instance
import
Instance
#
from vm.models.instance import Instance
from
common.models
import
HumanReadableException
#
from common.models import HumanReadableException
from
forms
import
OcciAuthForm
from
forms
import
OcciAuthForm
import
json
import
json
from
django.views.decorators.csrf
import
ensure_csrf_cookie
from
django.views.decorators.csrf
import
ensure_csrf_cookie
...
@@ -48,6 +48,7 @@ class OcciLogoutView(View):
...
@@ -48,6 +48,7 @@ class OcciLogoutView(View):
result
=
{
"result"
:
"OK"
}
result
=
{
"result"
:
"OK"
}
return
JsonResponse
(
result
)
return
JsonResponse
(
result
)
class
TestView
(
View
):
class
TestView
(
View
):
""" TEST VIEW """
""" TEST VIEW """
def
get
(
self
,
request
,
*
args
,
**
kwargs
):
def
get
(
self
,
request
,
*
args
,
**
kwargs
):
...
...
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