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
f69117b2
authored
May 13, 2013
by
Bence Dányi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
firewall_gui: show snat_to field of vlan
parent
d00fee67
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
3 deletions
+23
-3
firewall_gui/static/partials/vlan-edit.html
+18
-2
firewall_gui/views.py
+5
-1
No files found.
firewall_gui/static/partials/vlan-edit.html
View file @
f69117b2
...
@@ -60,8 +60,6 @@
...
@@ -60,8 +60,6 @@
<span
class=
"help-inline"
ng-bind=
"getError('owner')"
></span>
<span
class=
"help-inline"
ng-bind=
"getError('owner')"
></span>
</div>
</div>
</div>
</div>
</div>
<div
class=
"span5"
>
<div
class=
"control-group"
ng-class=
"hasError('interface')"
>
<div
class=
"control-group"
ng-class=
"hasError('interface')"
>
<label
class=
"control-label"
for=
"interface"
>
Interface
</label>
<label
class=
"control-label"
for=
"interface"
>
Interface
</label>
<div
class=
"controls"
>
<div
class=
"controls"
>
...
@@ -69,6 +67,8 @@
...
@@ -69,6 +67,8 @@
<span
class=
"help-inline"
ng-bind=
"getError('interface')"
></span>
<span
class=
"help-inline"
ng-bind=
"getError('interface')"
></span>
</div>
</div>
</div>
</div>
</div>
<div
class=
"span5"
>
<div
class=
"control-group"
ng-class=
"hasError('domain')"
>
<div
class=
"control-group"
ng-class=
"hasError('domain')"
>
<label
class=
"control-label"
for=
"domain"
>
Domain
</label>
<label
class=
"control-label"
for=
"domain"
>
Domain
</label>
<div
class=
"controls"
>
<div
class=
"controls"
>
...
@@ -107,6 +107,22 @@
...
@@ -107,6 +107,22 @@
<span
class=
"help-inline"
ng-bind=
"getError('dhcp_pool')"
></span>
<span
class=
"help-inline"
ng-bind=
"getError('dhcp_pool')"
></span>
</div>
</div>
</div>
</div>
<div
class=
"control-group"
ng-class=
"hasError('vlans')"
>
<label
class=
"control-label"
for=
"hostgroups"
>
NAT to (?)
</label>
<div
class=
"controls"
>
<div
class=
"well well-small"
>
<span
class=
"label label-info"
ng-repeat=
"vlan in entity.vlans | filter: destroyed"
>
<a
href=
"#/vlans/{{vlan.id}}"
>
{{vlan.name}}
</a>
<a
href
ng-click=
"removeVlan(vlan)"
><i
class=
"icon-remove"
></i></a>
</span>
</div>
<div
class=
"input-append"
>
<input
class=
"span2 vlan"
id=
"vlan"
type=
"text"
ng-model=
"newVlan"
>
<button
class=
"btn"
type=
"button"
ng-click=
"addVlan(newVlan)"
>
Add
</button>
<span
class=
"help-inline"
ng-bind=
"getError('vlans')"
></span>
</div>
</div>
</div>
<div
class=
"control-group"
>
<div
class=
"control-group"
>
<div
class=
"controls"
>
<div
class=
"controls"
>
<button
type=
"submit"
class=
"btn"
ng-click=
"save()"
>
Save
</button>
<button
type=
"submit"
class=
"btn"
ng-click=
"save()"
>
Save
</button>
...
...
firewall_gui/views.py
View file @
f69117b2
...
@@ -288,7 +288,11 @@ def show_vlan(request, id):
...
@@ -288,7 +288,11 @@ def show_vlan(request, id):
},
},
'accept'
:
rule
.
accept
,
'accept'
:
rule
.
accept
,
'nat'
:
rule
.
nat
'nat'
:
rule
.
nat
}
for
rule
in
vlan
.
rules
.
all
()]
}
for
rule
in
vlan
.
rules
.
all
()],
'vlans'
:
[{
'id'
:
vlan
.
id
,
'name'
:
vlan
.
name
,
}
for
vlan
in
vlan
.
snat_to
.
all
()]
}
}
return
HttpResponse
(
json
.
dumps
(
vlan
),
content_type
=
'application/json'
)
return
HttpResponse
(
json
.
dumps
(
vlan
),
content_type
=
'application/json'
)
...
...
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