Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/73517
Change subject: got job refreshing smoothed a bit
......................................................................
got job refreshing smoothed a bit
Change-Id: Ia5a5748a3af4bb615061b20c8b80bce4423f74e2
---
M wikimetrics/models/job.py
M wikimetrics/static/js/jobList.js
M wikimetrics/templates/jobs.html
3 files changed, 11 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/17/73517/1
diff --git a/wikimetrics/models/job.py b/wikimetrics/models/job.py
index 9270296..10674d9 100644
--- a/wikimetrics/models/job.py
+++ b/wikimetrics/models/job.py
@@ -69,12 +69,11 @@
name=None,
result_key=None,
children=[]):
- if user_id is not None:
- self.user_id = user_id
+ if current_user.is_authenticated():
+ self.user_id = current_user.id
else:
self.user_id = None
- #else:
- #self.user_id = current_user.id
+
self.status = status
self.name = name
self.result_key = result_key
diff --git a/wikimetrics/static/js/jobList.js b/wikimetrics/static/js/jobList.js
index f6b0b25..25c9768 100644
--- a/wikimetrics/static/js/jobList.js
+++ b/wikimetrics/static/js/jobList.js
@@ -15,9 +15,11 @@
}, viewModel);
// get jobs from jobs/detail/endpoint
- setInterval(function () {
+ getJobs = function () {
site.populateJobs(viewModel);
- }, 2000);
+ };
+ getJobs();
+ setInterval(getJobs, 10000);
ko.applyBindings(viewModel);
});
diff --git a/wikimetrics/templates/jobs.html b/wikimetrics/templates/jobs.html
index 0957af5..a1060d6 100644
--- a/wikimetrics/templates/jobs.html
+++ b/wikimetrics/templates/jobs.html
@@ -7,7 +7,7 @@
</a>
<table class="table table-striped">
<caption>
- (Refreshes automatically every 2 seconds)
+ (Refreshes automatically every 10 seconds)
</caption>
<thead>
<tr>
@@ -18,7 +18,9 @@
</thead>
<tbody data-bind="foreach: jobs_sorted">
<tr>
- <td data-bind="text: moment.unix(created).format('YYYY-MM-DD
HH:mm')"></td>
+ <td>
+ <span data-bind="text: moment.unix(created).calendar()"></span>
+ </td>
<td data-bind="text: status"></td>
<td data-bind="text: name"></td>
<td>...</td>
--
To view, visit https://gerrit.wikimedia.org/r/73517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5a5748a3af4bb615061b20c8b80bce4423f74e2
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
