Adds changing settings to admin logs

bslatkin · Aug 5, 2013 · 8fbf14b · 8fbf14b
1 parent 506e2e5
commit 8fbf14b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/dpxdt/server/frontend.py b/dpxdt/server/frontend.py
@@ -351,8 +351,9 @@ def build_settings():
         build.send_email = settings_form.send_email.data
         build.email_alias = settings_form.email_alias.data
 
-        logging.info('Setting build_id=%r, send_email=%r, email_alias=%r',
-                     build.id, build.send_email, build.email_alias)
+        message = ('send_email=%r, email_alias=%r' % (
+            build.send_email, build.email_alias))
+        auth.save_admin_log(build, changed_settings=True, message=message)
 
         db.session.add(build)
         db.session.commit()

diff --git a/dpxdt/server/models.py b/dpxdt/server/models.py
@@ -206,6 +206,7 @@ def __repr__(self):
 class AdminLog(db.Model):
     """Log of admin user actions for a build."""
 
+    CHANGED_SETTINGS = 'changed_settings'
     CREATED_API_KEY = 'created_api_key'
     CREATED_BUILD = 'created_build'
     INVITE_ACCEPTED = 'invite_accepted'
@@ -219,9 +220,9 @@ class AdminLog(db.Model):
     RELEASE_REVIEWING = 'release_reviewing'
 
     LOG_TYPES = frozenset([
-        CREATED_API_KEY, CREATED_BUILD, INVITE_ACCEPTED, INVITED_NEW_ADMIN,
-        REVOKED_ADMIN, REVOKED_API_KEY, RUN_APPROVED, RUN_REJECTED,
-        RELEASE_BAD, RELEASE_GOOD, RELEASE_REVIEWING])
+        CHANGED_SETTINGS, CREATED_API_KEY, CREATED_BUILD, INVITE_ACCEPTED,
+        INVITED_NEW_ADMIN, REVOKED_ADMIN, REVOKED_API_KEY, RUN_APPROVED,
+        RUN_REJECTED, RELEASE_BAD, RELEASE_GOOD, RELEASE_REVIEWING])
 
     id = db.Column(db.Integer, primary_key=True)
     build_id = db.Column(db.Integer, db.ForeignKey('build.id'), nullable=False)

diff --git a/dpxdt/server/templates/fragment_admin_log.html b/dpxdt/server/templates/fragment_admin_log.html
@@ -1,9 +1,9 @@
 {% macro line(description, detail=None, build_id=None, release=None, run=None) %}
-    <div class="span3">
+    <div class="span2">
         <strong>{{ description }}</strong>
     </div>
     {% if detail or release or run %}
-        <div class="span5">
+        <div class="span6">
             {% if run %}
                 <a href="{{ url_for('view_run', id=release.build_id, name=release.name, number=release.number, test=run.name) }}" title="Release: {{ release.name }} #{{ release.number }}" class="big-link ellipsis-overflow">{{ run.name }}</a>
             {% elif release %}

diff --git a/dpxdt/server/templates/view_admin_log.html b/dpxdt/server/templates/view_admin_log.html
@@ -28,7 +28,9 @@ <h4>Activity log</h4>
             {{ admin_log.user.email_address }}
         </div>
 
-        {% if admin_log.log_type == 'created_api_key' %}
+        {% if admin_log.log_type == 'changed_settings' %}
+            {{ log.line(description='Changed settings', detail=admin_log.message) }}
+        {% elif admin_log.log_type == 'created_api_key' %}
             {{ log.line(description='Created API key', detail=admin_log.message) }}
         {% elif admin_log.log_type == 'created_build' %}
             {{ log.line(description='Created build ' + admin_log.message) }}