Page MenuHomeGRNET
Files F1090434

No OneTemporary
Actions

File Metadata

Created
Wed, Oct 15, 7:46 AM

View Options

diff --git a/app/views/clients/_client.html.erb b/app/views/clients/_client.html.erb
index 0e68e35..18a6926 100644
--- a/app/views/clients/_client.html.erb
+++ b/app/views/clients/_client.html.erb
@@ -1,17 +1,16 @@
<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><%= number_to_human_size(client.quota) %></td>
<td>
<% if client.quota.to_f > 0 %>
<%= pretty_percentage(@stats.jobs_sizes[client.id].to_f / client.quota, client.quota) %>
<% end %>
</td>
<td><%= number_by_magnitude(@stats.jobs_files[client.id]) %></td>
- <td><%= client.auto_prune_human %></td>
</tr>
diff --git a/app/views/clients/_client_details.html.erb b/app/views/clients/_client_details.html.erb
index c5304a9..46217d7 100644
--- a/app/views/clients/_client_details.html.erb
+++ b/app/views/clients/_client_details.html.erb
@@ -1,62 +1,58 @@
<div class="col-xs-4">
<div class="table-responsive">
<table class="table table-striped table-bordered table-condensed ">
<tr>
<td>Name</td>
<td><%= @client.name %></td>
</tr>
<tr>
<td>Uname</td>
<td><%= @client.uname %></td>
</tr>
<tr>
<td>Active Jobs</td>
<td><%= @client.running_jobs %></td>
</tr>
<tr>
<td>Last Backup</td>
<td>
<%= @client.last_job_date_formatted %>
</td>
</tr>
<tr>
<td>File Retention</td>
<td><%= @client.file_retention_days %> days</td>
</tr>
<tr>
<td>Job Retention</td>
<td><%= @client.job_retention_days %> days</td>
</tr>
<tr>
<td>Total Space Used</td>
<td><%= number_to_human_size @client.backup_jobs_size %></td>
</tr>
<tr>
<td>Client Quota</td>
<td><%= number_to_human_size @client.quota %></td>
</tr>
<tr>
<td>Space Used %</td>
<td>
<% if @client.quota.to_f > 0 %>
<%= pretty_percentage(@client.backup_jobs_size.to_f / @client.quota, @client.quota) %>
<% end %>
</td>
</tr>
<tr>
<td>Files count</td>
<td><%= number_by_magnitude(@client.files_count) %></td>
</tr>
- <tr>
- <td>Auto Prune</td>
- <td><%= @client.auto_prune_human %></td>
- </tr>
</table>
</div>
<div>
<% if @client.is_backed_up? %>
<%= link_to 'Restore Files', restore_client_path(@client),
class: "btn btn-warning", role: "button" %>
<% end %>
</div>
</div>
diff --git a/app/views/clients/index.html.erb b/app/views/clients/index.html.erb
index 325bfac..66315a0 100644
--- a/app/views/clients/index.html.erb
+++ b/app/views/clients/index.html.erb
@@ -1,56 +1,54 @@
<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>File Ret. (days)</th>
<th>Job Ret. (days)</th>
<th>Space Used</th>
<th>Quota</th>
<th>Space Used %</th>
<th>Files</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 } %>
diff --git a/app/views/hosts/_host.html.erb b/app/views/hosts/_host.html.erb
index 3049628..fde918c 100644
--- a/app/views/hosts/_host.html.erb
+++ b/app/views/hosts/_host.html.erb
@@ -1,17 +1,16 @@
<tr>
<td><%= link_to host.name, host_path(host) %></td>
<td><%= host.fqdn %></td>
<td><%= host.port %></td>
<td>**********</td>
<td><%= host.file_retention %></td>
<td><%= host.job_retention %></td>
- <td><%= host.auto_prune_human %></td>
<td>
<% if host.verified? %>
<span class="label label-success">yes</span>
<% else %>
<span class="label label-danger">no</span>
<% end %>
</td>
<td><%= I18n.l(host.created_at, format: :long) %></td>
</tr>
diff --git a/app/views/hosts/_host_details.html.erb b/app/views/hosts/_host_details.html.erb
index 5a3d21c..55b9b89 100644
--- a/app/views/hosts/_host_details.html.erb
+++ b/app/views/hosts/_host_details.html.erb
@@ -1,77 +1,73 @@
<div class="col-xs-4">
<div class="table-responsive">
<table class="table table-striped table-bordered table-condensed">
<tr>
<td><b>Name</b></td>
<td><%= @host.name %></td>
</tr>
<tr>
<td><b>FQDN</b></td>
<td><%= @host.fqdn %></td>
</tr>
<tr>
<td><b>FDPort</b></td>
<td><%= @host.port %></td>
</tr>
<tr>
<td><b>Password</b></td>
<td>********</td>
</tr>
<tr>
<td><b>File Retention</b></td>
<td><%= @host.file_retention %> days</td>
</tr>
<tr>
<td><b>Job Retention</b></td>
<td><%= @host.job_retention %> days</td>
</tr>
<tr>
- <td><b>Auto Prune</b></td>
- <td><%= @host.auto_prune_human %></td>
- </tr>
- <tr>
<td><b>Verified</b></td>
<td>
<% if @host.verified? %>
<span class="label label-success">yes</span>
<% else %>
<span class="label label-danger">no</span>
<% end %>
</td>
</tr>
<tr>
<td><b>Created</b></td>
<td><%= I18n.l(@host.created_at, format: :long) %></td>
</tr>
</table>
</div>
<div class='row'>
<div class='col-xs-2'>
<%= link_to 'Edit', edit_host_path(@host), class: "btn btn-primary", role: "button" %>
</div>
<% if @host.needs_dispatch? %>
<div class='col-xs-4 pull-right text-right'>
<%= link_to 'Deploy Changes', submit_config_host_path(@host), method: :post,
class: 'btn btn-success', role: 'button' %>
</div>
<% end %>
<% if @host.needs_revoke? %>
<div class='col-xs-4 pull-right text-right'>
<%= link_to 'Remove From Bacula', revoke_host_path(@host), method: :delete,
class: 'btn btn-danger', role: 'button' %>
</div>
<% end %>
</div>
<br />
<div class='row'>
<% if @host.client %>
<div class='col-xs-12 text-right'>
<%= link_to "Back to <b>#{@host.name}</b> client".html_safe, client_path(@host.client) %>
</div>
<% end %>
</div>
</div>

Event Timeline