diff options
| author | Dan McGee <dan@archlinux.org> | 2014-11-08 14:04:31 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2014-11-08 14:04:31 -0600 |
| commit | 122273496a24c4608de776978b1b449d9c6cde09 (patch) | |
| tree | 770a26478722ef2b6054c40d64c1e6f4e5d6cf4f | |
| parent | 713ab837ba59c4a7c0b60cb8e8be4b27f4520e52 (diff) | |
| download | archweb-122273496a24c4608de776978b1b449d9c6cde09.tar.gz archweb-122273496a24c4608de776978b1b449d9c6cde09.zip | |
Make delay a property, not a function
And re-indent the URL details log template now that we've broken it out.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | mirrors/models.py | 1 | ||||
| -rw-r--r-- | templates/mirrors/url_details_logs.html.jinja | 54 |
2 files changed, 28 insertions, 27 deletions
diff --git a/mirrors/models.py b/mirrors/models.py index 820f3328..9743d177 100644 --- a/mirrors/models.py +++ b/mirrors/models.py @@ -165,6 +165,7 @@ class MirrorLog(models.Model): is_success = models.BooleanField(default=True) error = models.TextField(blank=True, default='') + @property def delay(self): if self.last_sync is None: return None diff --git a/templates/mirrors/url_details_logs.html.jinja b/templates/mirrors/url_details_logs.html.jinja index 8f7c5644..09742f76 100644 --- a/templates/mirrors/url_details_logs.html.jinja +++ b/templates/mirrors/url_details_logs.html.jinja @@ -1,28 +1,28 @@ - <h3>Check Logs</h3> +<h3>Check Logs</h3> - <table id="check_logs" class="results"> - <thead> - <tr> - <th>Check Time</th> - <th>Check Location</th> - <th>Check IP</th> - <th>Last Sync</th> - <th>Delay (hh:mm)</th> - <th>Duration (s)</th> - <th>Success?</th> - <th>Error Message</th> - </tr> - </thead> - <tbody> - {% for log in logs %}<tr class="{{ loop.cycle('odd', 'even') }}"> - <td>{{ log.check_time|date('Y-m-d H:i') }}</td> - <td class="country">{{ country_flag(log.location.country) }}{{ log.location.country.name }}</td> - <td>{{ log.location.source_ip }}</td> - <td>{{ log.last_sync|date('Y-m-d H:i') }}</td> - <td>{{ log.delay()|duration }}</td> - <td>{{ log.duration|floatvalue }}</td> - <td>{{ log.is_success|yesno|capfirst }}</td> - <td class="wrap">{{ log.error|linebreaksbr }}</td> - </tr>{% endfor %} - </tbody> - </table> +<table id="check_logs" class="results"> + <thead> + <tr> + <th>Check Time</th> + <th>Check Location</th> + <th>Check IP</th> + <th>Last Sync</th> + <th>Delay (hh:mm)</th> + <th>Duration (s)</th> + <th>Success?</th> + <th>Error Message</th> + </tr> + </thead> + <tbody> + {% for log in logs %}<tr class="{{ loop.cycle('odd', 'even') }}"> + <td>{{ log.check_time|date('Y-m-d H:i') }}</td> + <td class="country">{{ country_flag(log.location.country) }}{{ log.location.country.name }}</td> + <td>{{ log.location.source_ip }}</td> + <td>{{ log.last_sync|date('Y-m-d H:i') }}</td> + <td>{{ log.delay|duration }}</td> + <td>{{ log.duration|floatvalue }}</td> + <td>{{ log.is_success|yesno|capfirst }}</td> + <td class="wrap">{{ log.error|linebreaksbr }}</td> + </tr>{% endfor %} + </tbody> +</table> |