Various cleanup

conftest.py

@@ -33,6 +33,23 @@ def pytest_configure(config):
             'NAME': ':memory:',
         })
 
+    # http://djangosnippets.org/snippets/646/
+    class InvalidVarException(object):
+        def __mod__(self, missing):
+            try:
+                missing_str = unicode(missing)
+            except:
+                missing_str = 'Failed to create string representation'
+            raise Exception('Unknown template variable %r %s' % (missing, missing_str))
+
+        def __contains__(self, search):
+            if search == '%s':
+                return True
+            return False
+
+    settings.TEMPLATE_DEBUG = True
+    # settings.TEMPLATE_STRING_IF_INVALID = InvalidVarException()
+
     # Disable static compiling in tests
     settings.STATIC_BUNDLES = {}
 

src/sentry/templates/sentry/account/appearance.html

@@ -27,7 +27,7 @@
             <div><legend>{% trans "Events" %}</legend></div>
 
             {% with form.stacktrace_order as field %}
-                {% include "sentry/partial/_form_field.html" %}
+                {{ field|as_crispy_field }}
             {% endwith %}
         </fieldset>
 
@@ -36,7 +36,7 @@
             <div><legend>{% trans "Localization" %}</legend></div>
 
             {% with form.language as field %}
-                {% include "sentry/partial/_form_field.html" %}
+                {{ field|as_crispy_field }}
             {% endwith %}
         </fieldset>
 

src/sentry/templates/sentry/account/settings.html

@@ -24,7 +24,7 @@
         <p>{% trans "To make changes to your account, you must first enter your current password." %}</p>
         {% with form.old_password as field %}
             {% if field %}
-                {% include "sentry/partial/_form_field.html" %}
+                {{ field|as_crispy_field }}
             {% endif %}
         {% endwith %}
         <hr>
@@ -35,10 +35,10 @@
             </div>
         </fieldset>
         {% with form.first_name as field %}
-            {% include "sentry/partial/_form_field.html" %}
+            {{ field|as_crispy_field }}
         {% endwith %}
         {% with form.email as field %}
-            {% include "sentry/partial/_form_field.html" %}
+            {{ field|as_crispy_field }}
         {% endwith %}
         <fieldset class="control-group">
             <label>Avatar</label>
@@ -50,7 +50,7 @@
         <hr>
         <p>{% trans "You may also optionally change your password." %}</p>
         {% with form.new_password as field %}
-            {% include "sentry/partial/_form_field.html" %}
+            {{ field|as_crispy_field }}
         {% endwith %}
 
         <fieldset class="form-actions">

src/sentry/templates/sentry/admin/status/mail.html

@@ -52,7 +52,7 @@
         {{ form|as_crispy_errors }}
 
         {% for field in form %}
-            {% include "sentry/partial/_form_field.html" %}
+            {{ field|as_crispy_field }}
         {% endfor %}
 
         <input type="submit" class="btn" value="{% blocktrans with request.user.email as email %}Send a test email to {{ email }}{% endblocktrans %}">

src/sentry/templates/sentry/admin/users/edit.html

@@ -20,7 +20,7 @@
             {% csrf_token %}
             {{ form|as_crispy_errors }}
             {% for field in form %}
-                {% include "sentry/partial/_form_field.html" %}
+                {{ field|as_crispy_field }}
             {% endfor %}
             <fieldset class="form-actions">
                 <button type="submit" class="btn btn-primary">{% trans "Save Changes" %}</button>

src/sentry/templates/sentry/admin/users/remove.html

@@ -18,7 +18,7 @@
             {% csrf_token %}
             {{ form|as_crispy_errors }}
             {% for field in form %}
-                {% include "sentry/partial/_form_field.html" %}
+                {{ field|as_crispy_field }}
             {% endfor %}
             <fieldset class="form-actions">
                 <button type="submit" class="btn btn-danger">{% trans "Confirm" %}</button> <a href="{% url 'sentry-admin-edit-user' the_user.pk %}" class="btn">{% trans "Cancel" %}</a>

src/sentry/templates/sentry/events/replay_request.html

@@ -1,5 +1,6 @@
 {% extends "sentry/groups/details.html" %}
 
+{% load crispy_forms_tags %}
 {% load i18n %}
 
 {% block title %}{% trans "Replay Request" %} | {{ block.super }}{% endblock %}
@@ -29,8 +30,9 @@
 
                 <form action="" method="post">
                     {% csrf_token %}
+                    {{ form|as_crispy_errors }}
                     {% for field in form %}
-                        {% include "sentry/partial/_form_field.html" %}
+                        {{ field|as_crispy_field }}
                     {% endfor %}
                     <fieldset class="form-actions">
                         <button type="submit" class="btn btn-primary">{% trans "Submit" %}</button>

src/sentry/templates/sentry/layout.html

@@ -28,7 +28,6 @@
             app.config.popupCss = '{% url 'sentry-media' "sentry" 'styles/popup.css' %}';
             app.config.mediaUrl = '{% url 'sentry-media' "sentry" '' %}';
             app.config.urlPrefix = {{ URL_PREFIX|to_json|safe }};
-            app.config.hasRealtime = {{ hasRealtime|to_json|safe  }} || false;
             {% if project %}
                 app.config.projectId = {{ project.slug|to_json|safe }};
                 app.config.teamId = {{ project.team.slug|to_json|safe }};

src/sentry/templates/sentry/login.html

@@ -26,7 +26,7 @@
                     {% csrf_token %}
 
                     {% for field in form %}
-                        {% include "sentry/partial/_form_field.html" %}
+                        {{ field|as_crispy_field }}
                     {% endfor %}
 
                     <fieldset class="form-actions">

src/sentry/templates/sentry/partial/_form.html

@@ -6,7 +6,7 @@
     {{ form|as_crispy_errors }}
 
     {% for field in form %}
-        {% include "sentry/partial/_form_field.html" %}
+        {{ field|as_crispy_field }}
     {% endfor %}
 
     <fieldset class="form-actions">