Merge branch 'master' into em-device-ports-json

Conflicts: Netdisco/lib/App/Netdisco/Web/Device.pm
2014-11-16 21:59:35 +00:00
parent dd6904cb18 f6ae7be611
commit 269cbf8708
26 changed files with 179 additions and 92 deletions
--- a/Netdisco/share/views/layouts/main.tt
+++ b/Netdisco/share/views/layouts/main.tt
@@ -122,6 +122,11 @@
              <button type="submit" class="btn btn-link nd_btn-link">NBTstat All</button>
            </form>
          </li>
+          <li>
+            <form method="post" class="nd_inline-form" action="[% uri_for('/admin/expire') %]">
+              <button type="submit" class="btn btn-link nd_btn-link">Run Expire Job</button>
+            </form>
+          </li>
          [% IF settings._admin_tasks.size %]
            <li class="divider"></li>
            [% FOREACH ai IN settings._admin_order %]