Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
2d9bc07b
authored
Apr 22, 2014
by
Oláh István Gergely
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: set id on group searching box, fix js
parent
9865a867
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
circle/dashboard/static/dashboard/dashboard.js
+1
-1
circle/dashboard/templates/dashboard/index-groups.html
+1
-1
circle/dashboard/views.py
+1
-1
No files found.
circle/dashboard/static/dashboard/dashboard.js
View file @
2d9bc07b
...
@@ -289,7 +289,7 @@ function generateVmHTML(pk, name, host, icon, _status, fav) {
...
@@ -289,7 +289,7 @@ function generateVmHTML(pk, name, host, icon, _status, fav) {
'</a>'
;
'</a>'
;
}
}
function
generate
uGroupHTML
(
name
,
url
,
icon
,
_status
,
fav
)
{
function
generate
GroupHTML
(
url
,
name
)
{
return
name
+
url
+
return
name
+
url
+
''
;
''
;
}
}
...
...
circle/dashboard/templates/dashboard/index-groups.html
View file @
2d9bc07b
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<div
href=
"#"
class=
"list-group-item list-group-footer text-right"
>
<div
href=
"#"
class=
"list-group-item list-group-footer text-right"
>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-sm-6 col-xs-6 input-group input-group-sm"
>
<div
class=
"col-sm-6 col-xs-6 input-group input-group-sm"
>
<input
type=
"text"
class=
"form-control"
placeholder=
"{% trans "
Search
..."
%}"
/>
<input
id=
"dashboard-group-search-input"
type=
"text"
class=
"form-control"
placeholder=
"{% trans "
Search
..."
%}"
/>
<div
class=
"input-group-btn"
>
<div
class=
"input-group-btn"
>
<button
type=
"submit"
class=
"form-control btn btn-primary"
title=
"search"
><i
class=
"icon-search"
></i></button>
<button
type=
"submit"
class=
"form-control btn btn-primary"
title=
"search"
><i
class=
"icon-search"
></i></button>
</div>
</div>
...
...
circle/dashboard/views.py
View file @
2d9bc07b
...
@@ -994,7 +994,7 @@ class GroupList(LoginRequiredMixin, SuperuserRequiredMixin, SingleTableView):
...
@@ -994,7 +994,7 @@ class GroupList(LoginRequiredMixin, SuperuserRequiredMixin, SingleTableView):
'operator'
,
user
)
.
values_list
(
'pk'
)]
'operator'
,
user
)
.
values_list
(
'pk'
)]
groups
=
Group
.
objects
.
filter
(
groupprofile__in
=
pks
)
groups
=
Group
.
objects
.
filter
(
groupprofile__in
=
pks
)
groups
=
[{
groups
=
[{
'url'
:
i
.
get_absolute_url
()
,
'url'
:
''
,
'name'
:
i
.
name
}
for
i
in
groups
]
'name'
:
i
.
name
}
for
i
in
groups
]
return
HttpResponse
(
return
HttpResponse
(
json
.
dumps
(
list
(
groups
)),
json
.
dumps
(
list
(
groups
)),
...
...
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