Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
04ea76c5
Commit
04ea76c5
authored
Sep 14, 2017
by
Gabriel Detraz
Committed by
root
Sep 14, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Deplacement du reglage autocapture
parent
60308c31
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
5 deletions
+19
-5
preferences/migrations/0019_remove_optionaltopologie_mac_autocapture.py
...grations/0019_remove_optionaltopologie_mac_autocapture.py
+19
-0
preferences/models.py
preferences/models.py
+0
-1
preferences/templates/preferences/display_preferences.html
preferences/templates/preferences/display_preferences.html
+0
-4
No files found.
preferences/migrations/0019_remove_optionaltopologie_mac_autocapture.py
0 → 100644
View file @
04ea76c5
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2017-09-14 16:11
from
__future__
import
unicode_literals
from
django.db
import
migrations
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'preferences'
,
'0018_optionaltopologie_mac_autocapture'
),
]
operations
=
[
migrations
.
RemoveField
(
model_name
=
'optionaltopologie'
,
name
=
'mac_autocapture'
,
),
]
preferences/models.py
View file @
04ea76c5
...
@@ -59,7 +59,6 @@ class OptionalTopologie(models.Model):
...
@@ -59,7 +59,6 @@ class OptionalTopologie(models.Model):
radius_general_policy
=
models
.
CharField
(
max_length
=
32
,
choices
=
CHOICE_RADIUS
,
default
=
'DEFINED'
)
radius_general_policy
=
models
.
CharField
(
max_length
=
32
,
choices
=
CHOICE_RADIUS
,
default
=
'DEFINED'
)
vlan_decision_ok
=
models
.
OneToOneField
(
'machines.Vlan'
,
on_delete
=
models
.
PROTECT
,
related_name
=
'decision_ok'
,
blank
=
True
,
null
=
True
)
vlan_decision_ok
=
models
.
OneToOneField
(
'machines.Vlan'
,
on_delete
=
models
.
PROTECT
,
related_name
=
'decision_ok'
,
blank
=
True
,
null
=
True
)
vlan_decision_nok
=
models
.
OneToOneField
(
'machines.Vlan'
,
on_delete
=
models
.
PROTECT
,
related_name
=
'decision_nok'
,
blank
=
True
,
null
=
True
)
vlan_decision_nok
=
models
.
OneToOneField
(
'machines.Vlan'
,
on_delete
=
models
.
PROTECT
,
related_name
=
'decision_nok'
,
blank
=
True
,
null
=
True
)
mac_autocapture
=
models
.
BooleanField
(
default
=
False
)
class
GeneralOption
(
models
.
Model
):
class
GeneralOption
(
models
.
Model
):
PRETTY_NAME
=
"Options générales"
PRETTY_NAME
=
"Options générales"
...
...
preferences/templates/preferences/display_preferences.html
View file @
04ea76c5
...
@@ -96,10 +96,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
...
@@ -96,10 +96,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<th>
Vlan où placer les machines après rejet RADIUS
</th>
<th>
Vlan où placer les machines après rejet RADIUS
</th>
<td>
{{ topologieoptions.vlan_decision_nok }}
</td>
<td>
{{ topologieoptions.vlan_decision_nok }}
</td>
</tr>
</tr>
<tr>
<th>
Autocapture des macs à la connexion
</th>
<td>
{{ topologieoptions.mac_autocapture }}
</tr>
</table>
</table>
<h4>
Préférences generales
</h4>
<h4>
Préférences generales
</h4>
{% if is_bureau %}
{% if is_bureau %}
...
...
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