Skip to content

Commit

Permalink
0.2.0.5 更新后台admin 展示样式
Browse files Browse the repository at this point in the history
0.2.0.5 更新后台admin 展示样式
  • Loading branch information
hequan2017 committed Apr 14, 2018
1 parent c8228a0 commit ed0498e
Show file tree
Hide file tree
Showing 9 changed files with 68 additions and 124 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
db.sqlite3
.idea

migrations/

# Windows:
Thumbs.db
Expand Down
16 changes: 14 additions & 2 deletions asset/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@



class AssetAdmin(admin.ModelAdmin):
search_fields = ('hostname ','network_ip','inner_ip','project','ctime') ## 定义搜索框以哪些字段可以搜索
list_display = ('hostname','network_ip','inner_ip','project','platform','region','manager','is_active')# 每行的显示信息
list_display_links = ('hostname','network_ip','inner_ip',) #设置哪些字段可以点击进入编辑界面
list_filter = ("project",'manager','platform','region',)

admin.site.register(asset)
admin.site.register(asset_user)
class AssetUserAdmin(admin.ModelAdmin):
search_fields = ('hostname','username',)
list_display = ('hostname','username','private_key','ps')
list_display_links = ('hostname','username',)
list_filter = ('hostname','username',)


admin.site.register(asset,AssetAdmin)
admin.site.register(asset_user,AssetUserAdmin)
71 changes: 0 additions & 71 deletions asset/migrations/0001_initial.py

This file was deleted.

18 changes: 0 additions & 18 deletions asset/migrations/0002_auto_20180331_1456.py

This file was deleted.

File renamed without changes.
16 changes: 16 additions & 0 deletions index/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

from django.contrib import admin
from index.models import login_log


class LogAdmin(admin.ModelAdmin):
search_fields = ('user','ip','ctime')
list_display = ('user','ip','ctime')
list_display_links = ('user','ip','ctime')
list_filter =('user','ip','ctime')

admin.site.register(login_log,LogAdmin)




28 changes: 0 additions & 28 deletions index/migrations/0001_initial.py

This file was deleted.

37 changes: 33 additions & 4 deletions tasks/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,41 @@
from djcelery.models import TaskMeta,TaskSetMeta
from .models import tools_script,tool_results,variable


class TaskMetaAdmin(admin.ModelAdmin):
readonly_fields = ('result',)
search_fields = ('task_id','status','result','date_done',)
list_display = ('task_id','status','result','date_done',)
list_display_links = ('task_id','status','result','date_done',)
list_filter = ('task_id','status','date_done',)



admin.site.register(TaskMeta,TaskMetaAdmin)
admin.site.register(TaskSetMeta)


admin.site.register(tool_results)
admin.site.register(tools_script)
admin.site.register(variable)
class ToolResultsAdmin(admin.ModelAdmin):
search_fields = ('id','task_id','status','ctime',)
list_display = ('id','task_id','status','ctime',)
list_display_links = ('id','task_id','status','ctime',)
list_filter = ('id','ctime',)


class ToolScriptAdmin(admin.ModelAdmin):
search_fields = ('name','tool_run_type','comment','ctime',)
list_display = ('name','tool_run_type','comment','ctime',)
list_display_links = ('name','tool_run_type','comment','ctime',)
list_filter = ('name','tool_run_type','comment','ctime',)


class VarsAdmin(admin.ModelAdmin):
search_fields = ('name','desc','assets','ctime',)
list_display = ('name','desc','ctime',)
list_display_links = ('name','desc','ctime',)
list_filter = ('name','desc','assets','ctime',)



admin.site.register(tool_results,ToolResultsAdmin)
admin.site.register(tools_script,ToolScriptAdmin)
admin.site.register(variable,VarsAdmin)
4 changes: 4 additions & 0 deletions tasks/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ class variable(models.Model):
vars = JSONField(null=True, blank=True, default={}, verbose_name='变量')
assets = models.ManyToManyField(asset, verbose_name='关联资产',related_name='asset', blank=True)

ctime = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
utime = models.DateTimeField(auto_now=True, verbose_name='更新时间')


def __str__(self):
return self.name

Expand Down

0 comments on commit ed0498e

Please sign in to comment.