޸jpermistion --> jperm

jasset/views.py

@@ -7,7 +7,7 @@ from django.core.paginator import Paginator, EmptyPage
 from models import IDC, Asset, BisGroup
 from juser.models import UserGroup
 from connect import PyCrypt, KEY
-from jpermission.models import Permission
+from jperm.models import Permission
 
 cryptor = PyCrypt(KEY)
 

jpermission/urls.py → jperm/urls.py

 from django.conf.urls import patterns, include, url
 
 
-urlpatterns = patterns('jpermission.views',
+urlpatterns = patterns('jperm.views',
     # Examples:
     # url(r'^$', 'jumpserver.views.home', name='home'),
     # url(r'^blog/', include('blog.urls')),
@@ -9,5 +9,5 @@ urlpatterns = patterns('jpermission.views',
     (r'^perm_host/$', 'perm_host'),
     (r'^perm_add/$', 'perm_add'),
     (r'^perm_user_show/$', 'perm_user_show'),
-    (r'^perm_list/$', 'perm_list'),
+    (r'^perm_host/$', 'perm_list'),
 )

jpermission/views.py → jperm/views.py

@@ -4,7 +4,7 @@ from django.shortcuts import render_to_response
 from django.http import HttpResponseRedirect
 from juser.models import User
 from jasset.models import Asset
-from jpermission.models import Permission
+from jperm.models import Permission
 from django.core.paginator import Paginator, EmptyPage, InvalidPage
 
 

jumpserver/settings.py

@@ -49,7 +49,7 @@ INSTALLED_APPS = (
     'jumpserver',
     'juser',
     'jasset',
-    'jpermission',
+    'jperm',
     'jlog',
 )
 

jumpserver/urls.py

@@ -9,6 +9,6 @@ urlpatterns = patterns('',
     (r'^skin_config/$', 'jumpserver.views.skin_config'),
     (r'^base/$', 'jumpserver.views.base'),
     (r'^juser/', include('juser.urls')),
-    (r'^jperm/', include('jpermission.urls')),
+    (r'^jperm/', include('jperm.urls')),
     url(r'^jasset/', include('jasset.urls')),
 )