Move mail subject customization into notifications tab

Author: dcramer

src/sentry/templates/sentry/projects/notifications.html

@@ -19,6 +19,16 @@ <h3>{% trans "Events" %}</h3>
 
         <p>{% trans "Sentry will automatically notify you whenever an event is first seen, or its state changes from resolved to unresolved." %}</p>
 
+        <div class="page-header">
+            <h3>{% trans "General" %}</h3>
+        </div>
+
+        {{ general_form|as_crispy_errors }}
+
+        {% for field in general_form %}
+            {{ field|as_crispy_field }}
+        {% endfor %}
+
         <div class="page-header">
             <h3>{% trans "Alerts" %}</h3>
         </div>

src/sentry/web/forms/projects.py

@@ -111,11 +111,10 @@ class EditProjectForm(BaseProjectForm):
         help_text=_('Separate multiple entries with a newline.'))
     resolve_age = RangeField(help_text=_('Treat an event as resolved if it hasn\'t been seen for this amount of time.'),
         required=False, min_value=0, max_value=168, step_value=1)
-    mail_subject_prefix = forms.CharField(label=_('Mail Subject Prefix'), required=False)
     owner = UserField(required=False)
 
     class Meta:
-        fields = ('name', 'platform', 'public', 'team', 'owner', 'slug', 'mail_subject_prefix')
+        fields = ('name', 'platform', 'public', 'team', 'owner', 'slug')
         model = Project
 
     def __init__(self, request, team_list, data, instance, *args, **kwargs):
@@ -155,6 +154,12 @@ class AlertSettingsForm(forms.Form):
         help_text=_('Generate an alert only when an event is seen more than this many times during the interval.'),)
 
 
+class NotificationSettingsForm(forms.Form):
+    subject_prefix = forms.CharField(
+        label=_('Mail Subject Prefix'), required=False,
+        help_text=_('Choose a custom prefix for emails from this project.'))
+
+
 class NotificationTagValuesForm(forms.Form):
     values = forms.CharField(required=False)
 

src/sentry/web/frontend/projects/notifications.py

@@ -5,6 +5,7 @@
 :copyright: (c) 2012 by the Sentry Team, see AUTHORS for more details.
 :license: BSD, see LICENSE for more details.
 """
+from django.conf import settings
 from django.contrib import messages
 from django.core.context_processors import csrf
 from django.core.urlresolvers import reverse
@@ -16,7 +17,7 @@
 from sentry.models import TagKey
 from sentry.web.decorators import has_access
 from sentry.web.forms.projects import (
-    AlertSettingsForm, NotificationTagValuesForm
+    AlertSettingsForm, NotificationTagValuesForm, NotificationSettingsForm
 )
 from sentry.web.helpers import render_to_response
 
@@ -26,6 +27,15 @@
 def notification_settings(request, team, project):
     initial = project.get_option('notifcation:tags', {})
 
+    general_form = NotificationSettingsForm(
+        data=request.POST or None,
+        prefix='general',
+        initial={
+            'subject_prefix': project.get_option(
+                'mail:subject_prefix', settings.EMAIL_SUBJECT_PREFIX),
+        },
+    )
+
     tag_forms = []
     for tag in TagKey.objects.all_keys(project):
         tag_forms.append(NotificationTagValuesForm(
@@ -50,16 +60,23 @@ def notification_settings(request, team, project):
         }
     )
 
-    if request.method == 'POST' and all(f.is_valid() for f in tag_forms) and alert_form.is_valid():
+    all_forms = [
+        alert_form,
+        general_form,
+    ] + tag_forms
+
+    if request.method == 'POST' and all(f.is_valid() for f in all_forms):
         tags = {}
-        for form in tag_forms:
-            values = form.cleaned_data['values']
+        for t_form in tag_forms:
+            values = t_form.cleaned_data['values']
             if values:
-                tags[form.tag] = values
-        project.update_option('notifcation:tags', tags)
+                tags[t_form.tag] = values
 
+        project.update_option('notifcation:tags', tags)
         project.update_option('alert:threshold', (
             alert_form.cleaned_data['pct_threshold'], alert_form.cleaned_data['min_events']))
+        project.update_option(
+            'mail:subject_prefix', general_form.cleaned_data['subject_prefix'])
 
         messages.add_message(
             request, messages.SUCCESS,
@@ -71,6 +88,7 @@ def notification_settings(request, team, project):
     context.update({
         'team': team,
         'project': project,
+        'general_form': general_form,
         'alert_form': alert_form,
         'tag_forms': tag_forms,
         'page': 'notifications',

src/sentry/web/frontend/projects/settings.py

@@ -5,7 +5,6 @@
 :copyright: (c) 2012 by the Sentry Team, see AUTHORS for more details.
 :license: BSD, see LICENSE for more details.
 """
-from django.conf import settings
 from django.contrib import messages
 from django.core.context_processors import csrf
 from django.core.urlresolvers import reverse
@@ -35,14 +34,12 @@ def manage_project(request, team, project):
         'origins': '\n'.join(project.get_option('sentry:origins', None) or []),
         'owner': project.owner,
         'resolve_age': int(project.get_option('sentry:resolve_age', 0)),
-        'mail_subject_prefix': project.get_option('mail:subject_prefix', settings.EMAIL_SUBJECT_PREFIX),
     })
 
     if form.is_valid():
         project = form.save()
         project.update_option('sentry:origins', form.cleaned_data.get('origins') or [])
         project.update_option('sentry:resolve_age', form.cleaned_data.get('resolve_age'))
-        project.update_option('mail:subject_prefix', form.cleaned_data.get('mail_subject_prefix'))
         messages.add_message(
             request, messages.SUCCESS,
             _('Changes to your project were saved.'))