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
Commit
fb85d493
authored
Jun 13, 2013
by
Bence Dányi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
firewall_gui: fix record name display
parent
14a431bc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
firewall_gui/static/partials/domain-list.html
+1
-1
firewall_gui/static/partials/record-list.html
+1
-1
firewall_gui/views.py
+4
-3
No files found.
firewall_gui/static/partials/domain-list.html
View file @
fb85d493
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
<td>
<td>
<div
class=
"well well-small"
>
<div
class=
"well well-small"
>
<span
class=
"label label-info"
ng-repeat=
"record in domain.records"
>
<span
class=
"label label-info"
ng-repeat=
"record in domain.records"
>
<a
href=
"#/records/{{record.id}}"
>
{{record.name}}
(#{{record.id}})
</a>
<a
href=
"#/records/{{record.id}}"
>
{{record.name}}
</a>
</span>
</span>
</div>
</div>
</td>
</td>
...
...
firewall_gui/static/partials/record-list.html
View file @
fb85d493
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
<th
colspan=
"2"
>
Tulajdonos
</th>
<th
colspan=
"2"
>
Tulajdonos
</th>
</tr>
</tr>
<tr
ng-repeat=
"record in getPage()"
>
<tr
ng-repeat=
"record in getPage()"
>
<td>
<td
style=
"max-width: 250px; overflow-x: auto;"
>
<a
href=
"#/records/{{record.id}}"
>
{{record.name}}
</a>
<a
href=
"#/records/{{record.id}}"
>
{{record.name}}
</a>
</td>
</td>
<td>
{{record.type}}
</td>
<td>
{{record.type}}
</td>
...
...
firewall_gui/views.py
View file @
fb85d493
...
@@ -145,11 +145,11 @@ def list_entities(request, name):
...
@@ -145,11 +145,11 @@ def list_entities(request, name):
'modified_at'
,
'modified_at'
,
'ttl'
,
'ttl'
,
'description'
,
'description'
,
(
'records'
,
lambda
entity
:
[{
'id'
:
entity
.
id
,
'name'
:
entity
.
name
}
for
entity
in
entity
.
record_set
.
all
()]),
(
'records'
,
lambda
entity
:
[{
'id'
:
entity
.
id
,
'name'
:
entity
.
get_name
()
}
for
entity
in
entity
.
record_set
.
all
()]),
'owner'
]),
'owner'
]),
'records'
:
make_entity_lister
(
Record
,
[
'records'
:
make_entity_lister
(
Record
,
[
'id'
,
'id'
,
'name'
,
(
'name'
,
lambda
entity
:
entity
.
get_name
())
,
'domain'
,
'domain'
,
'host'
,
'host'
,
'type'
,
'type'
,
...
@@ -546,7 +546,8 @@ def show_domain(request, id=None):
...
@@ -546,7 +546,8 @@ def show_domain(request, id=None):
'created_at'
:
domain
.
created_at
.
isoformat
(),
'created_at'
:
domain
.
created_at
.
isoformat
(),
'modified_at'
:
domain
.
modified_at
.
isoformat
(),
'modified_at'
:
domain
.
modified_at
.
isoformat
(),
'ttl'
:
domain
.
ttl
,
'ttl'
:
domain
.
ttl
,
'description'
:
domain
.
description
'description'
:
domain
.
description
,
}
}
except
:
except
:
domain
=
{
domain
=
{
...
...
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