Ryan Wilcox avatar Ryan Wilcox committed ac8b639

found bug with user settings not being named same all over

Comments (0)

Files changed (2)

setups/project/user_setup_switch.py

 def do_user_setup_switch(root_path, project_path):
     # first, copy over our user_setup.py
     filecopy( os.path.join(root_path, "supporting", "user_setup_template.py"),
-            os.path.join(project_path, "user_setup.py") )
+            os.path.join(project_path, "settings_user.py") )
     
     # and change settings.py to pull our user setup in...
     applypatch( os.path.join(root_path, "supporting", "user_setup.diff"),

supporting/user_setup.diff

 +# used for INSTALLED_APPS and things we don't want to change.
 +#
 +# There may be an established pattern for this in the Django world, but
-+# I'm just going to do it my way for now: load a user_settings.py, if it exists,
++# I'm just going to do it my way for now: load a settings_user.py, if it exists,
 +# into the namespace of this project. It'll override values that are already there
 +# in the namespace, and that's EXACTLY what we want.
 +# WD-rpw 07-05-2010
 +#
 +use_local_settings = True
 +try:
-+    from user_settings import *
++    from settings_user import *
 +except ImportError, e:
 +    use_local_settings = False
 +
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.