From 96738976fb5c5a82643671ad55872f08797cfe80 Mon Sep 17 00:00:00 2001
From: guanghongwei <hongwei.guang@yolu-inc.com>
Date: Sat, 24 Jan 2015 14:46:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9jpermistion=20-->=20jperm=20?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jasset/views.py                    | 2 +-
 {jpermission => jperm}/__init__.py | 0
 {jpermission => jperm}/admin.py    | 0
 {jpermission => jperm}/models.py   | 0
 {jpermission => jperm}/tests.py    | 0
 {jpermission => jperm}/urls.py     | 4 ++--
 {jpermission => jperm}/views.py    | 2 +-
 jumpserver/settings.py             | 2 +-
 jumpserver/urls.py                 | 2 +-
 9 files changed, 6 insertions(+), 6 deletions(-)
 rename {jpermission => jperm}/__init__.py (100%)
 rename {jpermission => jperm}/admin.py (100%)
 rename {jpermission => jperm}/models.py (100%)
 rename {jpermission => jperm}/tests.py (100%)
 rename {jpermission => jperm}/urls.py (78%)
 rename {jpermission => jperm}/views.py (98%)

diff --git a/jasset/views.py b/jasset/views.py
index 482ed8fad..c04d34281 100644
--- a/jasset/views.py
+++ b/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)
 
diff --git a/jpermission/__init__.py b/jperm/__init__.py
similarity index 100%
rename from jpermission/__init__.py
rename to jperm/__init__.py
diff --git a/jpermission/admin.py b/jperm/admin.py
similarity index 100%
rename from jpermission/admin.py
rename to jperm/admin.py
diff --git a/jpermission/models.py b/jperm/models.py
similarity index 100%
rename from jpermission/models.py
rename to jperm/models.py
diff --git a/jpermission/tests.py b/jperm/tests.py
similarity index 100%
rename from jpermission/tests.py
rename to jperm/tests.py
diff --git a/jpermission/urls.py b/jperm/urls.py
similarity index 78%
rename from jpermission/urls.py
rename to jperm/urls.py
index 60fe5446c..a82d23305 100644
--- a/jpermission/urls.py
+++ b/jperm/urls.py
@@ -1,7 +1,7 @@
 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'),
 )
diff --git a/jpermission/views.py b/jperm/views.py
similarity index 98%
rename from jpermission/views.py
rename to jperm/views.py
index 174b1f9a6..dc5f071ef 100644
--- a/jpermission/views.py
+++ b/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
 
 
diff --git a/jumpserver/settings.py b/jumpserver/settings.py
index 5b991157f..2a20aab9d 100644
--- a/jumpserver/settings.py
+++ b/jumpserver/settings.py
@@ -49,7 +49,7 @@ INSTALLED_APPS = (
     'jumpserver',
     'juser',
     'jasset',
-    'jpermission',
+    'jperm',
     'jlog',
 )
 
diff --git a/jumpserver/urls.py b/jumpserver/urls.py
index 44bb490c8..13e669b86 100644
--- a/jumpserver/urls.py
+++ b/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')),
 )