Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
R
red-ci-cd
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
red-group-test
red-ci-cd
Commits
e55c6478
Commit
e55c6478
authored
Jan 22, 2020
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed unused models
parent
2b14eb1d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
44 deletions
+0
-44
app/entities/models.py
app/entities/models.py
+0
-44
No files found.
app/entities/models.py
View file @
e55c6478
...
...
@@ -1224,49 +1224,6 @@ class AssetGroup(models.Model):
super
(
AssetGroup
,
self
)
.
save
(
*
args
,
**
kwargs
)
code
=
number_generator
(
enums
.
GenerateCode
.
ASSET_GROUP
.
value
,
self
.
id
)
if
self
.
code
==
''
:
self
.
code
=
code
self
.
created
=
datetime
.
now
()
<<<<<<<
HEAD
self
.
save
()
=======
self
.
save
()
class
ChangeRequestSettings
(
models
.
Model
):
code
=
models
.
CharField
(
unique
=
True
,
max_length
=
255
)
active_user
=
models
.
ForeignKey
(
User
,
on_delete
=
models
.
CASCADE
,
to_field
=
'code'
,
related_name
=
'cms_settings_active_users'
)
behalf_user
=
models
.
ForeignKey
(
User
,
on_delete
=
models
.
CASCADE
,
to_field
=
'code'
,
related_name
=
'cms_settings_behalf_users'
)
behalf_approved
=
models
.
BooleanField
(
default
=
False
)
behalf_accepted
=
models
.
BooleanField
(
default
=
False
)
behalf_rejected
=
models
.
BooleanField
(
default
=
False
)
behalf_implemented
=
models
.
BooleanField
(
default
=
False
)
behalf_completed
=
models
.
BooleanField
(
default
=
False
)
created
=
models
.
DateTimeField
(
auto_now_add
=
True
)
deleted_at
=
models
.
DateTimeField
(
null
=
True
,
blank
=
True
)
class
Meta
:
db_table
=
'change_request_settings'
ordering
=
[
'-created'
]
unique_together
=
[
'active_user'
,
'behalf_user'
]
def
__str__
(
self
):
return
f
'{self.code}'
def
save
(
self
,
*
args
,
**
kwargs
):
super
(
ChangeRequestSettings
,
self
)
.
save
(
*
args
,
**
kwargs
)
code
=
number_generator
(
enums
.
GenerateCode
.
CMS_SETTINGS
.
value
,
self
.
id
)
if
self
.
code
==
''
:
self
.
code
=
code
self
.
created
=
datetime
.
now
()
...
...
@@ -1293,4 +1250,3 @@ class Branch(models.Model):
def
__str__
(
self
):
return
f
'{self.branch_name}'
>>>>>>>
ef388d8
...
filter
files
for
all
dependent
of
branches
endpoint
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