更名为adminset

guohongze · Feb 15, 2017 · 464c9ec · 464c9ec
1 parent dfdf92d
commit 464c9ec
Show file tree

Hide file tree

Showing 57 changed files with 787 additions and 1,017 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/.idea/woss2.iml b/.idea/woss2.iml
diff --git a/woss2/__init__.py → adminset/__init__.py b/woss2/__init__.py → adminset/__init__.py
diff --git a/woss2/__init__.pyc → adminset/__init__.pyc b/woss2/__init__.pyc → adminset/__init__.pyc
diff --git a/woss2/__pycache__/__init__.cpython-35.pyc → adminset/__pycache__/__init__.cpython-35.pyc b/woss2/__pycache__/__init__.cpython-35.pyc → adminset/__pycache__/__init__.cpython-35.pyc
diff --git a/woss2/__pycache__/settings.cpython-35.pyc → adminset/__pycache__/settings.cpython-35.pyc b/woss2/__pycache__/settings.cpython-35.pyc → adminset/__pycache__/settings.cpython-35.pyc
diff --git a/woss2/ldap.py → adminset/ldap.py b/woss2/ldap.py → adminset/ldap.py
diff --git a/woss2/settings.py → adminset/settings.py b/woss2/settings.py → adminset/settings.py
@@ -1,5 +1,5 @@
 """
-Django settings for woss2 project.
+Django settings for adminset project.
 
 Generated by 'django-admin startproject' using Django 1.9.1.
 
@@ -53,7 +53,7 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-ROOT_URLCONF = 'woss2.urls'
+ROOT_URLCONF = 'adminset.urls'
 
 TEMPLATES = [
     {
@@ -72,7 +72,7 @@
     },
 ]
 
-WSGI_APPLICATION = 'woss2.wsgi.application'
+WSGI_APPLICATION = 'adminset.wsgi.application'
 
 
 # Database

diff --git a/woss2/settings.pyc → adminset/settings.pyc b/woss2/settings.pyc → adminset/settings.pyc
diff --git a/woss2/urls.py → adminset/urls.py b/woss2/urls.py → adminset/urls.py
diff --git a/woss2/urls.pyc → adminset/urls.pyc b/woss2/urls.pyc → adminset/urls.pyc
diff --git a/woss2/views.py → adminset/views.py b/woss2/views.py → adminset/views.py
diff --git a/woss2/views.pyc → adminset/views.pyc b/woss2/views.pyc → adminset/views.pyc
diff --git a/woss2/wsgi.py → adminset/wsgi.py b/woss2/wsgi.py → adminset/wsgi.py
@@ -1,5 +1,5 @@
 """
-WSGI config for woss2 project.
+WSGI config for adminset project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
@@ -11,6 +11,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "woss2.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "adminset.settings")
 
 application = get_wsgi_application()
diff --git a/adminset/wsgi.pyc b/adminset/wsgi.pyc
diff --git a/ansible/__pycache__/admin.cpython-35.pyc b/ansible/__pycache__/admin.cpython-35.pyc
diff --git a/cmdb/__pycache__/admin.cpython-35.pyc b/cmdb/__pycache__/admin.cpython-35.pyc
diff --git a/cmdb/__pycache__/models.cpython-35.pyc b/cmdb/__pycache__/models.cpython-35.pyc
diff --git a/cmdb/admin.py b/cmdb/admin.py
@@ -14,7 +14,7 @@ class HostAdmin(admin.ModelAdmin):
         'cpu_model',
         'cpu_num',
         'sn',
-        'identity',
+        #'identity',
         ]
 
 

diff --git a/cmdb/admin.pyc b/cmdb/admin.pyc
diff --git a/cmdb/api.py b/cmdb/api.py
@@ -28,12 +28,12 @@ def collect(request):
             host = Host.objects.get(hostname=hostname)
         except:
             host = Host()
-        if req.POST.get('identity'):
-            identity = req.POST.get('identity')
-            try:
-                host = Host.objects.get(identity=identity)
-            except:
-                host = Host()
+        # if req.POST.get('identity'):
+        #     identity = req.POST.get('identity')
+        #     try:
+        #         host = Host.objects.get(identity=identity)
+        #     except:
+        #         host = Host()
         host.hostname = hostname
         host.group = group
         host.cpu_num = int(cpu_num)

diff --git a/cmdb/api.pyc b/cmdb/api.pyc
diff --git a/cmdb/migrations/0002_remove_host_identity.py b/cmdb/migrations/0002_remove_host_identity.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.8 on 2017-02-15 05:27
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cmdb', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='host',
+            name='identity',
+        ),
+    ]
diff --git a/cmdb/migrations/0002_remove_host_identity.pyc b/cmdb/migrations/0002_remove_host_identity.pyc
diff --git a/cmdb/models.py b/cmdb/models.py
@@ -36,7 +36,7 @@ class Host(models.Model):
     disk = models.CharField(max_length=255,null=True)
     sn = models.CharField(max_length=60)
     ip = models.GenericIPAddressField(max_length=15)
-    identity = models.CharField(max_length=32,null=True)
+    #identity = models.CharField(max_length=32,null=True)
     idc = models.ForeignKey(Idc, verbose_name=u"所在机房",null=True)
 
     def __unicode__(self):

diff --git a/cmdb/models.pyc b/cmdb/models.pyc
diff --git a/cmdb/urls.py b/cmdb/urls.py
@@ -6,8 +6,11 @@
 app_name = 'cmdb'
 urlpatterns = [
     #url(r'^$', views.IndexView.as_view(), name='index'),
-    url(r'^$', views.cmdb, name='cmdb'),
-    url(r'^excel', views.excel, name='excel'),
+    url(r'^$', views.index, name='cmdb'),
+    url(r'^excel/', views.excel, name='excel'),
+    url(r'^asset_add/', views.asset_add, name='asset_add'),
+    url(r'^asset_del/', views.asset_del, name='asset_del'),
+    url(r'^asset_edit/', views.asset_edit, name='asset_edit'),
     url(r'^login', views.login, name='login'),
     url(r'^sync', views.hostsync, name='sync'),
     url(r'^collect', api.collect, name='update_api'),

diff --git a/cmdb/urls.pyc b/cmdb/urls.pyc
diff --git a/cmdb/views.py b/cmdb/views.py
@@ -11,9 +11,10 @@
 sys.setdefaultencoding('utf8')
 
 
-def cmdb(request):
+def index(request):
+    temp_name = "cmdb/cmdb-header.html"
     host_list = Host.objects.all()
-    return render_to_response('bak/cmdb.html', locals())
+    return render_to_response('cmdb/index.html', locals())
 
 
 def excel(request):
@@ -57,4 +58,16 @@ def hostsync(request):
             host_item = m.hostname+" "+"ansible_host="+m.ip+" "+"host_name="+m.hostname+"\n"
             ansible_file.write(host_item)
     ansible_file.close()
-    return HttpResponse("ok")
+    return HttpResponse("ok")
+
+
+def asset_add(request):
+    return HttpResponse("ok")
+
+
+def asset_del(request):
+    pass
+
+
+def asset_edit(request):
+    pass
diff --git a/cmdb/views.pyc b/cmdb/views.pyc
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/manage.py b/manage.py
@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "woss2.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "adminset.settings")
 
     from django.core.management import execute_from_command_line
 

diff --git a/navi/__pycache__/admin.cpython-35.pyc b/navi/__pycache__/admin.cpython-35.pyc
diff --git a/navi/__pycache__/models.cpython-35.pyc b/navi/__pycache__/models.cpython-35.pyc
diff --git a/navi/urls.pyc b/navi/urls.pyc
diff --git a/navi/views.pyc b/navi/views.pyc
diff --git a/static/layer/layer.js b/static/layer/layer.js
diff --git a/static/layer/mobile/layer.js b/static/layer/mobile/layer.js
diff --git a/static/layer/mobile/need/layer.css b/static/layer/mobile/need/layer.css
diff --git a/static/layer/skin/default/icon-ext.png b/static/layer/skin/default/icon-ext.png
diff --git a/static/layer/skin/default/icon.png b/static/layer/skin/default/icon.png