Page MenuHomeGRNET
Files F887797

No OneTemporary
Actions

File Metadata

Created
Sun, Aug 10, 5:34 AM

View Options

diff --git a/app/views/admin/clients/_client.html.erb b/app/views/admin/clients/_client.html.erb
index c633088..e37a0c8 100644
--- a/app/views/admin/clients/_client.html.erb
+++ b/app/views/admin/clients/_client.html.erb
@@ -1,13 +1,16 @@
<tr>
<td><%= link_to_if client.host.present?, "##{client.id}", admin_client_path(client) %></td>
<td><%= link_to_if client.host.present?, client.name, admin_client_path(client) %></td>
<td><%= client.uname %></td>
<td><%= client.host.try(:origin) %></td>
<td><%= @stats.active_jobs[client.id] || 0 %></td>
<td><%= @stats.last_jobs[client.id] %></td>
<td><%= client.file_retention_days %></td>
<td><%= client.job_retention_days %></td>
<td><%= number_to_human_size(@stats.jobs_sizes[client.id]) %></td>
+ <td>
+ <%= [(100 * @stats.jobs_sizes[client.id] / Archiving.settings[:client_quota].to_f).round(1),
+ 100].min %> %
<td><%= number_by_magnitude(@stats.jobs_files[client.id]) %></td>
<td><%= client.auto_prune_human %></td>
</tr>
diff --git a/app/views/admin/clients/index.html.erb b/app/views/admin/clients/index.html.erb
index 468f4f9..61053ea 100644
--- a/app/views/admin/clients/index.html.erb
+++ b/app/views/admin/clients/index.html.erb
@@ -1,27 +1,28 @@
<h1>Bacula Clients</h1>
<div class="datatable-wrapper">
<div class="table-responsive">
<table id="admin_clients" class="table table-striped table-bordered table-condensed">
<thead>
<tr>
<th class="no-search">ClientId</th>
<th>Name</th>
<th>Uname</th>
<th>Client Type</th>
<th class="no-search">Active Jobs</th>
<th class="no-search">Last Backup</th>
<th class="no-search">FileRetention (days)</th>
<th class="no-search">JobRetention (days)</th>
<th class="no-search">Space Used</th>
+ <th class="no-search">Space Used %</th>
<th class="no-search">File count</th>
<th class="neither-search-nor-order">AutoPrune</th>
</tr>
</thead>
<tbody>
<%= render partial: 'client', collection: @clients %>
</tbody>
</table>
</div>
</div>
diff --git a/app/views/clients/_client.html.erb b/app/views/clients/_client.html.erb
index 012e4b3..87ffc9e 100644
--- a/app/views/clients/_client.html.erb
+++ b/app/views/clients/_client.html.erb
@@ -1,11 +1,15 @@
<tr>
<td><%= link_to client.name, client %></td>
<td><%= client.uname %></td>
<td><%= @stats.active_jobs[client.id] || 0 %></td>
<td><%= @stats.last_jobs[client.id] %></td>
<td><%= client.file_retention_days %></td>
<td><%= client.job_retention_days %></td>
<td><%= number_to_human_size(@stats.jobs_sizes[client.id]) %></td>
+ <td>
+ <%= [(100 * @stats.jobs_sizes[client.id] / Archiving.settings[:client_quota].to_f).round(1),
+ 100].min %> %
+ </td>
<td><%= number_by_magnitude(@stats.jobs_files[client.id]) %></td>
<td><%= client.auto_prune_human %></td>
</tr>
diff --git a/app/views/clients/index.html.erb b/app/views/clients/index.html.erb
index 20e488e..f3f16f8 100644
--- a/app/views/clients/index.html.erb
+++ b/app/views/clients/index.html.erb
@@ -1,54 +1,55 @@
<div class="row right">
<%= link_to 'New Client', new_host_path, class: 'btn btn-primary', role: 'button' %>
</div>
<h1>My Bacula Clients</h1>
<div class="table-responsive">
<table class="table table-striped table-bordered table-condensed">
<thead>
<tr>
<th>Name</th>
<th>Uname</th>
<th>Active Jobs</th>
<th>Last Backup</th>
<th>FileRetention (days)</th>
<th>JobRetention (days)</th>
<th>Space Used</th>
+ <th>Space Used %</th>
<th>File count</th>
<th>AutoPrune</th>
</tr>
</thead>
<tbody>
<%= render partial: 'client', collection: @clients %>
</tbody>
</table>
</div>
<% if @hosts.any? %>
<h1>My Pending Hosts</h1>
<div class="table-responsive">
<table class="table table-striped table-bordered table-condensed">
<thead>
<tr>
<th>Name</th>
<th>FQDN</th>
<th>Port</th>
<th>Password</th>
<th>FileRetention (days)</th>
<th>JobRetention (days)</th>
<th>AutoPrune</th>
<th>Verified</th>
<th>Created At</th>
</tr>
</thead>
<tbody>
<%= render partial: 'hosts/host', collection: @hosts %>
</tbody>
</table>
</div>
<% end %>
<%= render partial: 'client_graphs', locals: { path: clients_path } %>

Event Timeline