Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
ops
jumpserver
Commits
63fd3cff
Commit
63fd3cff
authored
Feb 25, 2017
by
Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed asset_group delete html
parent
a6825ac9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
18 deletions
+20
-18
forms.py
apps/assets/forms.py
+7
-7
asset_group_list.html
apps/assets/templates/assets/asset_group_list.html
+3
-1
views.py
apps/assets/views.py
+10
-10
No files found.
apps/assets/forms.py
View file @
63fd3cff
...
...
@@ -37,13 +37,13 @@ class AssetCreateForm(forms.ModelForm):
self
.
instance
.
tags
.
clear
()
self
.
instance
.
tags
.
add
(
*
tuple
(
tags
))
def
clean
(
self
):
clean_data
=
super
(
AssetCreateForm
,
self
)
.
clean
()
ip
=
clean_data
.
get
(
'ip'
)
port
=
clean_data
.
get
(
'port'
)
query
=
Asset
.
objects
.
filter
(
ip
=
ip
,
port
=
port
)
if
query
:
raise
forms
.
ValidationError
(
'this asset has exists.'
)
#
def clean(self):
#
clean_data = super(AssetCreateForm, self).clean()
#
ip = clean_data.get('ip')
#
port = clean_data.get('port')
#
query = Asset.objects.filter(ip=ip, port=port)
#
if query:
#
raise forms.ValidationError('this asset has exists.')
class
Meta
:
model
=
Asset
...
...
apps/assets/templates/assets/asset_group_list.html
View file @
63fd3cff
...
...
@@ -70,7 +70,9 @@ $(document).ready(function(){
var
uid
=
$this
.
data
(
'uid'
);
var
the_url
=
'{% url "api-assets:asset-group-detail" pk=99991937 %}'
.
replace
(
'99991937'
,
uid
);
objectDelete
(
$this
,
name
,
the_url
);
$data_table
.
ajax
.
reload
();
setTimeout
(
function
()
{
$data_table
.
ajax
.
reload
();
},
3000
);
})
.
on
(
'click'
,
'#btn_bulk_update'
,
function
()
{
...
...
apps/assets/views.py
View file @
63fd3cff
...
...
@@ -148,16 +148,16 @@ class AssetUpdateView(AdminUserRequiredMixin, UpdateAssetTagsMiXin, UpdateView):
# for i in prn_obj_key(form):
# if i not in self.new_form.keys():
# print i
#
#
#delattr(asset, '"%s" % i')
#
#del asset.i
#
asset.save()
#
asset.id = 27
#
# asset.created_by = self.request.user.username or 'Admin'
#
asset.save()
#
asset.id = 28
#
asset.save()
#
return super(AssetUpdateView, self).form_valid(form)
#delattr(asset, '"%s" % i')
#del asset.i
asset
.
save
()
asset
.
id
=
27
# asset.created_by = self.request.user.username or 'Admin'
asset
.
save
()
asset
.
id
=
28
asset
.
save
()
return
super
(
AssetUpdateView
,
self
)
.
form_valid
(
form
)
class
AssetDeleteView
(
DeleteView
):
...
...
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