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
fa37ec8f
authored
Feb 19, 2014
by
Dudás Ádám
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: allow templates to be deleted independently from instances (no cascade on delete)
parent
9d9659e6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
circle/vm/models/instance.py
+4
-4
No files found.
circle/vm/models/instance.py
View file @
fa37ec8f
...
@@ -5,12 +5,12 @@ from importlib import import_module
...
@@ -5,12 +5,12 @@ from importlib import import_module
import
string
import
string
import
django.conf
import
django.conf
from
django.db.models
import
(
BooleanField
,
CharField
,
DateTimeField
,
IntegerField
,
ForeignKey
,
Manager
,
ManyToManyField
,
permalink
,
TextField
)
from
django.contrib.auth.models
import
User
from
django.contrib.auth.models
import
User
from
django.core
import
signing
from
django.core
import
signing
from
django.core.exceptions
import
PermissionDenied
from
django.core.exceptions
import
PermissionDenied
from
django.db.models
import
(
BooleanField
,
CharField
,
DateTimeField
,
IntegerField
,
ForeignKey
,
Manager
,
ManyToManyField
,
permalink
,
SET_NULL
,
TextField
)
from
django.dispatch
import
Signal
from
django.dispatch
import
Signal
from
django.utils
import
timezone
from
django.utils
import
timezone
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.utils.translation
import
ugettext_lazy
as
_
...
@@ -180,7 +180,7 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
...
@@ -180,7 +180,7 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
help_text
=
_
(
"Human readable name of instance."
))
help_text
=
_
(
"Human readable name of instance."
))
description
=
TextField
(
blank
=
True
,
verbose_name
=
_
(
'description'
))
description
=
TextField
(
blank
=
True
,
verbose_name
=
_
(
'description'
))
template
=
ForeignKey
(
InstanceTemplate
,
blank
=
True
,
null
=
True
,
template
=
ForeignKey
(
InstanceTemplate
,
blank
=
True
,
null
=
True
,
related_name
=
'instance_set'
,
related_name
=
'instance_set'
,
on_delete
=
SET_NULL
,
help_text
=
_
(
"Template the instance derives from."
),
help_text
=
_
(
"Template the instance derives from."
),
verbose_name
=
_
(
'template'
))
verbose_name
=
_
(
'template'
))
pw
=
CharField
(
help_text
=
_
(
"Original password of the instance."
),
pw
=
CharField
(
help_text
=
_
(
"Original password of the instance."
),
...
...
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