Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Fukász Rómeó Ervin
/
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
8cba74b0
authored
Aug 01, 2014
by
Őry Máté
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
info: add help context
parent
f84f11f8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
circle/circle/urls.py
+2
-3
circle/dashboard/views.py
+9
-0
No files found.
circle/circle/urls.py
View file @
8cba74b0
...
@@ -23,7 +23,7 @@ from django.shortcuts import redirect
...
@@ -23,7 +23,7 @@ from django.shortcuts import redirect
from
django.core.urlresolvers
import
reverse
from
django.core.urlresolvers
import
reverse
from
circle.settings.base
import
get_env_variable
from
circle.settings.base
import
get_env_variable
from
dashboard.views
import
circle_login
from
dashboard.views
import
circle_login
,
HelpView
from
dashboard.forms
import
CirclePasswordResetForm
,
CircleSetPasswordForm
from
dashboard.forms
import
CirclePasswordResetForm
,
CircleSetPasswordForm
admin
.
autodiscover
()
admin
.
autodiscover
()
...
@@ -57,8 +57,7 @@ urlpatterns = patterns(
...
@@ -57,8 +57,7 @@ urlpatterns = patterns(
),
),
url
(
r'^accounts/login/?$'
,
circle_login
,
name
=
"accounts.login"
),
url
(
r'^accounts/login/?$'
,
circle_login
,
name
=
"accounts.login"
),
url
(
r'^accounts/'
,
include
(
'django.contrib.auth.urls'
)),
url
(
r'^accounts/'
,
include
(
'django.contrib.auth.urls'
)),
url
(
r'^info/help/$'
,
url
(
r'^info/help/$'
,
HelpView
.
as_view
(
template_name
=
"info/help.html"
),
TemplateView
.
as_view
(
template_name
=
"info/help.html"
),
name
=
"info.help"
),
name
=
"info.help"
),
url
(
r'^info/policy/$'
,
url
(
r'^info/policy/$'
,
TemplateView
.
as_view
(
template_name
=
"info/policy.html"
),
TemplateView
.
as_view
(
template_name
=
"info/policy.html"
),
...
...
circle/dashboard/views.py
View file @
8cba74b0
...
@@ -3122,6 +3122,15 @@ class UserKeyCreate(LoginRequiredMixin, SuccessMessageMixin, CreateView):
...
@@ -3122,6 +3122,15 @@ class UserKeyCreate(LoginRequiredMixin, SuccessMessageMixin, CreateView):
return
kwargs
return
kwargs
class
HelpView
(
TemplateView
):
def
get_context_data
(
self
,
*
args
,
**
kwargs
):
ctx
=
super
(
HelpView
,
self
)
.
get_context_data
(
*
args
,
**
kwargs
)
ctx
.
update
({
"saml"
:
hasattr
(
settings
,
"SAML_CONFIG"
),
"store"
:
settings
.
STORE_URL
})
return
ctx
class
StoreList
(
LoginRequiredMixin
,
TemplateView
):
class
StoreList
(
LoginRequiredMixin
,
TemplateView
):
template_name
=
"dashboard/store/list.html"
template_name
=
"dashboard/store/list.html"
...
...
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