Mod: Change 'user' app to 'system' folder

doraemonext · Sep 13, 2014 · 97c6367 · 97c6367
1 parent ad9a680
commit 97c6367
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,9 @@ nosetests.xml
 *.mo
 *.pot
 
+# Media
+wechat_platform/media
+
 # Pycharm
 .idea
 

diff --git a/wechat_platform/config/common.py b/wechat_platform/config/common.py
@@ -46,12 +46,17 @@ class Common(Configuration):
 
     # Apps specific for this project go here.
     LOCAL_APPS = (
-        'users',  # custom users app
+        'system.users',  # custom users app
         # Your stuff: custom apps go here
     )
 
+    # Wechat Plugin App
+    PLUGIN_APPS = (
+
+    )
+
     # See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
-    INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
+    INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS + PLUGIN_APPS
     # END APP CONFIGURATION
 
     # MIDDLEWARE CONFIGURATION

diff --git a/wechat_platform/system/__init__.py b/wechat_platform/system/__init__.py
@@ -0,0 +1 @@
+__author__ = 'Doraemonext'
diff --git a/wechat_platform/users/__init__.py → wechat_platform/system/users/__init__.py b/wechat_platform/users/__init__.py → wechat_platform/system/users/__init__.py
diff --git a/wechat_platform/users/admin.py → wechat_platform/system/users/admin.py b/wechat_platform/users/admin.py → wechat_platform/system/users/admin.py
diff --git a/wechat_platform/users/forms.py → wechat_platform/system/users/forms.py b/wechat_platform/users/forms.py → wechat_platform/system/users/forms.py
diff --git a/...platform/users/migrations/0001_initial.py → ...m/system/users/migrations/0001_initial.py b/...platform/users/migrations/0001_initial.py → ...m/system/users/migrations/0001_initial.py
diff --git a/wechat_platform/users/migrations/__init__.py → ...tform/system/users/migrations/__init__.py b/wechat_platform/users/migrations/__init__.py → ...tform/system/users/migrations/__init__.py
diff --git a/wechat_platform/users/models.py → wechat_platform/system/users/models.py b/wechat_platform/users/models.py → wechat_platform/system/users/models.py
diff --git a/wechat_platform/users/urls.py → wechat_platform/system/users/urls.py b/wechat_platform/users/urls.py → wechat_platform/system/users/urls.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from django.conf.urls import patterns, url
 
-from users import views
+import views
 
 urlpatterns = patterns('',
     # URL pattern for the UserListView  # noqa

diff --git a/wechat_platform/users/views.py → wechat_platform/system/users/views.py b/wechat_platform/users/views.py → wechat_platform/system/users/views.py
diff --git a/wechat_platform/urls.py b/wechat_platform/urls.py
@@ -22,7 +22,7 @@
     url(r'^admin/', include(admin.site.urls)),
 
     # User management
-    url(r'^users/', include("users.urls", namespace="users")),
+    url(r'^users/', include("system.users.urls", namespace="users")),
     url(r'^accounts/', include('allauth.urls')),
 
     # Uncomment the next line to enable avatars
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,9 @@ nosetests.xml @@
     *.mo
     *.pot
+    # Media
+    wechat_platform/media
     # Pycharm
     .idea
@@ Expand Down @@