Skip to content

Commit 8fbf14b

Browse files
committed
Adds changing settings to admin logs
1 parent 506e2e5 commit 8fbf14b

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

dpxdt/server/frontend.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,9 @@ def build_settings():
351351
build.send_email = settings_form.send_email.data
352352
build.email_alias = settings_form.email_alias.data
353353

354-
logging.info('Setting build_id=%r, send_email=%r, email_alias=%r',
355-
build.id, build.send_email, build.email_alias)
354+
message = ('send_email=%r, email_alias=%r' % (
355+
build.send_email, build.email_alias))
356+
auth.save_admin_log(build, changed_settings=True, message=message)
356357

357358
db.session.add(build)
358359
db.session.commit()

dpxdt/server/models.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ def __repr__(self):
206206
class AdminLog(db.Model):
207207
"""Log of admin user actions for a build."""
208208

209+
CHANGED_SETTINGS = 'changed_settings'
209210
CREATED_API_KEY = 'created_api_key'
210211
CREATED_BUILD = 'created_build'
211212
INVITE_ACCEPTED = 'invite_accepted'
@@ -219,9 +220,9 @@ class AdminLog(db.Model):
219220
RELEASE_REVIEWING = 'release_reviewing'
220221

221222
LOG_TYPES = frozenset([
222-
CREATED_API_KEY, CREATED_BUILD, INVITE_ACCEPTED, INVITED_NEW_ADMIN,
223-
REVOKED_ADMIN, REVOKED_API_KEY, RUN_APPROVED, RUN_REJECTED,
224-
RELEASE_BAD, RELEASE_GOOD, RELEASE_REVIEWING])
223+
CHANGED_SETTINGS, CREATED_API_KEY, CREATED_BUILD, INVITE_ACCEPTED,
224+
INVITED_NEW_ADMIN, REVOKED_ADMIN, REVOKED_API_KEY, RUN_APPROVED,
225+
RUN_REJECTED, RELEASE_BAD, RELEASE_GOOD, RELEASE_REVIEWING])
225226

226227
id = db.Column(db.Integer, primary_key=True)
227228
build_id = db.Column(db.Integer, db.ForeignKey('build.id'), nullable=False)

dpxdt/server/templates/fragment_admin_log.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{% macro line(description, detail=None, build_id=None, release=None, run=None) %}
2-
<div class="span3">
2+
<div class="span2">
33
<strong>{{ description }}</strong>
44
</div>
55
{% if detail or release or run %}
6-
<div class="span5">
6+
<div class="span6">
77
{% if run %}
88
<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>
99
{% elif release %}

dpxdt/server/templates/view_admin_log.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ <h4>Activity log</h4>
2828
{{ admin_log.user.email_address }}
2929
</div>
3030

31-
{% if admin_log.log_type == 'created_api_key' %}
31+
{% if admin_log.log_type == 'changed_settings' %}
32+
{{ log.line(description='Changed settings', detail=admin_log.message) }}
33+
{% elif admin_log.log_type == 'created_api_key' %}
3234
{{ log.line(description='Created API key', detail=admin_log.message) }}
3335
{% elif admin_log.log_type == 'created_build' %}
3436
{{ log.line(description='Created build ' + admin_log.message) }}

0 commit comments

Comments
 (0)