From 2ed22d5d08233f919088a2bef427ce333061d8f6 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sat, 22 Feb 2014 12:07:49 +0000 Subject: [PATCH] try to make the job queue page a little faster --- Netdisco/Changes | 1 + Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/JobQueue.pm | 2 +- Netdisco/share/config.yml | 2 +- Netdisco/share/views/ajax/admintask/jobqueue.tt | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Netdisco/Changes b/Netdisco/Changes index cf23e06b..c0cc55b9 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -13,6 +13,7 @@ * Default netmap depth set to 8 * Add a "waiting" message to the netmap whilst the data loads * Add a spinner to all waiting messages + * Try to make the Job Queue page a little faster [BUG FIXES] diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/JobQueue.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/JobQueue.pm index 88a011a7..27767ce9 100644 --- a/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/JobQueue.pm +++ b/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/JobQueue.pm @@ -32,7 +32,7 @@ ajax '/ajax/content/admin/jobqueue' => require_role admin => sub { ->with_times ->search({}, { order_by => { -desc => [qw/entered device action/] }, - rows => 200, + rows => 50, }); content_type('text/html'); diff --git a/Netdisco/share/config.yml b/Netdisco/share/config.yml index 3bcca381..1f9e5ba6 100644 --- a/Netdisco/share/config.yml +++ b/Netdisco/share/config.yml @@ -76,7 +76,7 @@ web_plugins: - Device::Neighbors - Device::Addresses extra_web_plugins: [] -jobqueue_refresh: 5 +jobqueue_refresh: 10 safe_password_store: true # ------------- diff --git a/Netdisco/share/views/ajax/admintask/jobqueue.tt b/Netdisco/share/views/ajax/admintask/jobqueue.tt index 7b4ae58c..81f71d91 100644 --- a/Netdisco/share/views/ajax/admintask/jobqueue.tt +++ b/Netdisco/share/views/ajax/admintask/jobqueue.tt @@ -1,4 +1,4 @@ -[% IF results.count == 0 %] +[% IF NOT results.has_rows %]
The job queue is empty.
[% ELSE %]