Changeset 7fb28a0

Timestamp:

Jul 5, 2014, 8:32:51 PM (11 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master

Children:

cabf7ac

Parents:

d604f81 (diff), e24d22f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (07/05/14 20:29:08)

git-committer:

Alex Dehnert <adehnert@…> (07/05/14 20:32:51)

Message:

Make development easier

• simple install instructions for a dev install
• support virtualenv
• add script for setting up a dev install
  • settings, including SECRET_KEY
  • DB sync
  • creation of an account structure for a semi-plausible group
  • BudgetTerm? creation
• Support the newest released Django (1.6)

Files:

• .gitignore (modified) (1 diff)
• INSTALL (deleted)
• INSTALL.rst (added)
• remit/finance_core/migrations/0004_socket_auth_password.py (modified) (2 diffs)
• remit/finance_core/urls.py (modified) (1 diff)
• remit/manage.py (modified) (1 diff)
• remit/remit_templates/base.html (modified) (3 diffs)
• remit/remit_templates/index.html (modified) (2 diffs)
• remit/remit_templates/registration/logged_out.html (modified) (2 diffs)
• remit/remit_templates/registration/login.html (modified) (2 diffs)
• remit/remit_templates/vouchers/ReimbursementRequest_review.html (modified) (2 diffs)
• remit/remit_templates/vouchers/reimbursementrequest_list.html (modified) (2 diffs)
• remit/settings/__init__.py (moved) (moved from remit/settings.py) (6 diffs)
• remit/settings/init-dev.sh (added)
• remit/settings/local.dev-template.py (added)
• remit/urls.py (modified) (3 diffs)
• remit/util/add_accounts (modified) (1 diff)
• remit/util/add_gl_accounts.py (modified) (1 diff)
• remit/util/setup.py (modified) (1 diff)
• remit/util/shortcuts.py (modified) (2 diffs)
• remit/util/templatetags/latex.py (modified) (1 diff)
• remit/vouchers/urls.py (modified) (1 diff)
• remit/vouchers/views.py (modified) (4 diffs)

.gitignore

@@ -3 +3 @@
 django-treebeard-1.1/
 django-treebeard-1.1.tar.gz
-local_settings.py
-local_settings_after.py
+remit/settings/local.py
+remit/settings/local_after.py
 database_settings
 client/settings.py

remit/finance_core/migrations/0004_socket_auth_password.py

@@ -3 +3 @@
 from south.db import db
 from south.v2 import DataMigration
-from django.contrib.auth.hashers import UNUSABLE_PASSWORD
+import django.contrib.auth.hashers
 from django.db import models
+from django.db.models import F
 
 class Migration(DataMigration):
@@ -11 +12 @@
         "Write your forwards methods here."
         issues = orm['auth.user'].objects.filter(password__in=['', 'SocketAuth'])
-        issues.update(password=UNUSABLE_PASSWORD)
+        try: # pre-1.6
+            new_password = django.contrib.auth.hashers.UNUSABLE_PASSWORD
+        except AttributeError: # post-1.6
+            # See https://code.djangoproject.com/ticket/20079 for details on the change.
+            # Ideally, we'd use a different suffix per user, but I don't want
+            # to deal with that, and this is probably acceptably secure.
+            #
+            # Also, it seems a little unlikely that this code will actually
+            # run -- it requires an install that hasn't already run the
+            # migration (notably, esp.mit.edu has already), but *does* have
+            # accounts with SocketAuth passwords.
+            prefix = django.contrib.auth.hashers.UNUSABLE_PASSWORD_PREFIX
+            suffix = django.contrib.auth.hashers.get_random_string(django.contrib.auth.hashers.UNUSABLE_PASSWORD_SUFFIX_LENGTH)
+            new_password = prefix + F("password") + prefix + suffix
+        issues.update(password=new_password)
 
     def backwards(self, orm):

remit/finance_core/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, include, url
 import finance_core.views
 

remit/manage.py

@@ -1 @@
-#!/usr/bin/python
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
+#!/usr/bin/env python
+import os
+import sys
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)

remit/remit_templates/base.html

@@ +1 @@
+{% load url from future %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -14 +15 @@
   <body>
     <ul class='tab-navigation'>
-        <li{% ifequal pagename "homepage" %} class='selected'{% endifequal %}><a href="{% url homepage %}">Home</a></li>
-        <li{% ifequal pagename "request_reimbursement" %} class='selected'{% endifequal %}><a href="{% url request_reimbursement %}">Request reimbursement</a></li>
-        <li{% ifequal pagename "list_requests" %} class='selected'{% endifequal %}><a href="{% url list_requests %}">List requests</a></li>
+        <li{% ifequal pagename "homepage" %} class='selected'{% endifequal %}><a href="{% url "homepage" %}">Home</a></li>
+        <li{% ifequal pagename "request_reimbursement" %} class='selected'{% endifequal %}><a href="{% url "request_reimbursement" %}">Request reimbursement</a></li>
+        <li{% ifequal pagename "list_requests" %} class='selected'{% endifequal %}><a href="{% url "list_requests" %}">List requests</a></li>
         {% if perms.finance_core.use_reporting %}
-        <li{% ifequal pagename "reporting" %} class='selected'{% endifequal %}><a href="{% url reporting %}">Reporting</a></li>
+        <li{% ifequal pagename "reporting" %} class='selected'{% endifequal %}><a href="{% url "reporting" %}">Reporting</a></li>
         {% endif %}
         {% if user.is_staff %}
-        <li><a href='{% url admin:index %}'>Django Admin</a></li>
+        <li><a href='{% url "admin:index" %}'>Django Admin</a></li>
         {% endif %}
     </ul>
@@ -33 +34 @@
             <p>Welcome, <span class='username'>{{user.username}}</span>.</p>
             {% endif %}
-            <p><a href='{% url logout %}'>Logout</a></p>
+            <p><a href='{% url "logout" %}'>Logout</a></p>
         </div>
         {% endif %}

remit/remit_templates/index.html

@@ -1 +1 @@
 {% extends "base.html" %}
+{% load url from future %}
 
 {% block title %}Welcome to Remit{% endblock %}
@@ -12 +13 @@
 <ul>
     {% if user.is_anonymous %}
-    <li><a href='{% url login %}'>Login</a></li>
+    <li><a href='{% url "login" %}'>Login</a></li>
     {% endif %}
-    <li><a href="{% url request_reimbursement %}">Request reimbursement</a></li>
-    <li><a href="{% url list_requests %}">List requests</a></li>
+    <li><a href="{% url "request_reimbursement" %}">Request reimbursement</a></li>
+    <li><a href="{% url "list_requests" %}">List requests</a></li>
     {% if perms.finance_core.use_reporting %}
-    <li><a href="{% url reporting %}">Reporting</a></li>
+    <li><a href="{% url "reporting" %}">Reporting</a></li>
     {% endif %}
     {% if user.is_staff %}
-    <li><a href='{% url admin:index %}'>Django admin interface</a></li>
+    <li><a href='{% url "admin:index" %}'>Django admin interface</a></li>
     {% endif %}
     {% if user.is_authenticated %}
-    <li><a href='{% url logout %}'>Logout</a></li>
+    <li><a href='{% url "logout" %}'>Logout</a></li>
     {% endif %}
 </ul>

remit/remit_templates/registration/logged_out.html

@@ -1 +1 @@
 {% extends "base.html" %}
+{% load url from future %}
 
 {% block title %}Logged out of Remit{% endblock %}
@@ -6 +7 @@
 <h2>Logged out of Remit</h2>
 
-<p>You have been logged out of Remit. You can return to the <a href='{% url homepage %}'>homepage</a> or <a href='{% url login %}'>login again</a>.</p>
+<p>You have been logged out of Remit. You can return to the <a href='{% url "homepage" %}'>homepage</a> or <a href='{% url "login" %}'>login again</a>.</p>
 {% endblock %}

remit/remit_templates/registration/login.html

@@ -1 +1 @@
 {% extends "base.html" %}
+{% load url from future %}
 
 {% block title %}Log in to Remit{% endblock %}
@@ -11 +12 @@
 {% endif %}
 
-<form method="post" action="{% url django.contrib.auth.views.login %}">
+<form method="post" action="{% url "django.contrib.auth.views.login" %}">
 {% csrf_token %}
 <table>

remit/remit_templates/vouchers/ReimbursementRequest_review.html

@@ -1 +1 @@
 {% extends "base.html" %}
+{% load url from future %}
 {% load misc %}
 
@@ -123 +124 @@
 {% else %}
 {% if perms.vouchers.change_reimbursementrequest %}
-<p>Optionally, <a href='{% url admin:vouchers_reimbursementrequest_change rr.pk %}'>change this request first</a>.</p>
+<p>Optionally, <a href='{% url "admin:vouchers_reimbursementrequest_change" rr.pk %}'>change this request first</a>.</p>
 {% endif %}
 <form method="post" action="">

remit/remit_templates/vouchers/reimbursementrequest_list.html

@@ -1 +1 @@
 {% extends "base.html" %}
+{% load url from future %}
 {% load misc %}
 
@@ -58 +59 @@
     <td>
         <input type='checkbox' name='select' value='{{object.pk}}'{%ifin object.pk selected_ids %} checked='checked'{%endifin%}></input>
-        <a href='{% url review_request object.pk %}'>{{ object.pk }}</a>
+        <a href='{% url "review_request" object.pk %}'>{{ object.pk }}</a>
     </td>
     <td>
-        <em><a href='{% url review_request object.pk %}'>{{ object.name }}</a></em>
+        <em><a href='{% url "review_request" object.pk %}'>{{ object.name }}</a></em>
         {% if object.documentation %}<br /><a href='{{object.documentation.backing_file.url}}'>(view docs)</a>{%endif%}
     </td>

remit/settings/__init__.py

@@ -3 +3 @@
 import sys
 
-SITE_ROOT = os.path.normpath(os.path.dirname(__file__))
+SITE_ROOT = os.path.normpath(os.path.join(os.path.dirname(__file__), '..'))
 SITE_WEB_PATH = ''
 DEFAULT_DOMAIN = 'mit.edu'
@@ -9 +9 @@
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
+
+ATOMIC_REQUESTS = True
 
 ADMINS = (
@@ -53 +55 @@
 USE_I18N = True
 
-from local_settings import *
+# Required settings
+# SITE_URL_BASE: used to construct absolute URLs for use in emails
+
+from local import *
 
 # Absolute path to the directory that holds media.
@@ -85 +90 @@
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.transaction.TransactionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
@@ -116 +120 @@
     'django.contrib.sessions',
     'django.contrib.sites',
+    'django.contrib.staticfiles',
     'treebeard',
     'south',
@@ -126 +131 @@
 USER_EMAIL_SIGNATURE = "%s Treasury" % (GROUP_NAME,)
 
-from local_settings_after import *
+from local_after import *

remit/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, include, url
 from django.contrib.auth.views import login, logout
 
@@ -6 +6 @@
 # Necessary views
 import finance_core.views
+from util.shortcuts import TemplateViewWithContext
 
 # Uncomment the next two lines to enable the admin:
@@ -13 +14 @@
 urlpatterns = patterns('',
     # Example:
-    (r'^$', 'django.views.generic.simple.direct_to_template', {'template': 'index.html', 'extra_context': { 'pagename':'homepage' }, }, 'homepage'),
+    url(r'^$', TemplateViewWithContext.as_view(template_name='index.html', extra_context={ 'pagename':'homepage' }), name='homepage'),
     (r'^vouchers/', include('vouchers.urls')),
     (r'^finance_core/', include('finance_core.urls')),

remit/util/add_accounts

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 import sys
 import os

remit/util/add_gl_accounts.py

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import sys

remit/util/setup.py

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 import sys
 import os

remit/util/shortcuts.py

@@ -2 +2 @@
 from django.template import RequestContext, Template
 from django.template.loader import get_template
+from django.views.generic.base import TemplateView
+from django.views.generic.list import ListView
 
 def get_403_response(request, errmsg=None, **extra_context):
@@ -8 +10 @@
     page = tmpl.render(ctx, )
     return HttpResponseForbidden(page)
+
+
+class ListViewWithContext(ListView):
+    extra_context = {}
+
+    # I believe .queryset will work out-of-the-box
+
+    def get_context_data(self, **kwargs):
+        context = super(ListViewWithContext,self).get_context_data(**kwargs)
+        context.update(self.extra_context)
+        return context
+
+
+class TemplateViewWithContext(TemplateView):
+    extra_context = {}
+
+    def get_context_data(self, **kwargs):
+        context = super(TemplateViewWithContext,self).get_context_data(**kwargs)
+        print context
+        context.update(self.extra_context)

remit/util/templatetags/latex.py

@@ -1 @@
-#!/usr/bin/python
 # Inspired by and partially copied from ESP's backslash stuff
 

remit/vouchers/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
-from django.views.generic.list_detail import object_list
+from django.conf.urls import patterns, include, url
 from django.contrib.auth.decorators import permission_required
 import vouchers.views

remit/vouchers/views.py

@@ -2 +2 @@
 from vouchers.models import ReimbursementRequest, Documentation
 from finance_core.models import BudgetTerm, BudgetArea
-from util.shortcuts import get_403_response
+from util.shortcuts import get_403_response, ListViewWithContext
 
 from django.contrib.auth.decorators import user_passes_test, login_required
@@ -17 +17 @@
 from django.template import Context, Template
 from django.template.loader import get_template
-from django.views.generic import list_detail
 
 import decimal
@@ -428 +427 @@
 
     # GENERATE THE REQUEST
-    return list_detail.object_list(
-        http_request,
+    callable = ListViewWithContext.as_view(
         queryset=qs,
         extra_context={
@@ -444 +442 @@
         },
     )
+    return callable(http_request)