Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rockon pre & post-install summaries are inconsistent #2904 #2915

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Rockon pre & post-install summaries are inconsistent #2904 #2915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ...rockstor/storageadmin/static/storageadmin/js/templates/rockons/settings_summary_table.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
<table class="table table-condensed table-bordered table-hover table-striped tablesorter">
<thead>
<tr>
<th>Resource type&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Type of the system resource on Rockstor. Eg: Share, port numbers etc.. Custom type is for arbitrary variables needed by the Rock-on that may not map to a system resource." rel="tooltip"></i></th>
<th>Name&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Name of the resource according to Rockstor. Eg: Share names, port numbers etc.." rel="tooltip"></i></th>
<th>Mapped representation&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Name/representation of the resource inside the Rock-on. Eg: Shares map to directories, ports map to (possibly different)ports to send traffic to the Rock-on, etc.." rel="tooltip"></i></th>
<th>Resource type&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Eg: Share, Port, Environmental variable etc. Custom type is for arbitrary variables needed by the Rock-on that may not map to an external resource." rel="tooltip"></i></th>
<th>Internal Reference&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Resource reference from inside the Rock-on/docker-containers. E.g.: internal directories, internal port numbers, Environmental variable names, etc.." rel="tooltip"></i></th>
<th>External Reference / Configured value&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Rockstor's reference for the given resource. E.g.: mapped Share, external Port, Environment variable value configured, etc.." rel="tooltip"></i></th>
</tr>
</thead>
{{#each volumes}}
<tr>
<td>Share</td>
<td>{{this.share_name}}</td>
<td>{{this.dest_dir}}</td>
<td>{{this.share_name}}</td>
</tr>
{{/each}}
{{display_newVolumes}}
{{#each ports}}
<tr>
<td>Port</td>
<td>{{this.hostp}}</td>
<td>{{this.containerp}}{{isPublished this.id this.publish}}</td>
<td>{{this.hostp}}</td>
<!--<td>{{this.containerp}}{{isPublished this.id}}</td>-->
</tr>
{{/each}}
Expand All @@ -37,22 +37,22 @@
{{#each cc}}
<tr>
<td>Custom</td>
<td>{{this.val}}&nbsp;&nbsp<i class="fa fa-info-circle" title="{{this.description}}" rel="tooltip"></i></td>
<td>{{this.key}}</td>
<td>{{this.val}}&nbsp;&nbsp<i class="fa fa-info-circle" title="{{this.description}}" rel="tooltip"></i></td>
</tr>
{{/each}}
{{#each device}}
<tr>
<td>Device</td>
<td>{{this.val}}&nbsp;&nbsp<i class="fa fa-info-circle" title="{{this.description}}" rel="tooltip"></i></td>
<td>{{this.dev}}</td>
<td>{{this.val}}&nbsp;&nbsp<i class="fa fa-info-circle" title="{{this.description}}" rel="tooltip"></i></td>
</tr>
{{/each}}
{{#each env}}
<tr>
<td>Env</td>
<td>{{this.val}}&nbsp;&nbsp<i class="fa fa-info-circle" title="{{this.description}}" rel="tooltip"></i></td>
<td>{{this.key}}</td>
<td>{{this.val}}&nbsp;&nbsp<i class="fa fa-info-circle" title="{{this.description}}" rel="tooltip"></i></td>
</tr>
{{/each}}
{{#each labels}}
Expand Down
12 changes: 6 additions & 6 deletions src/rockstor/storageadmin/static/storageadmin/js/templates/rockons/summary_table.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<table class="table table-condensed table-bordered table-hover table-striped tablesorter">
<thead>
<tr>
<th>Resource type&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Type of the system resource on Rockstor. Eg: Share, port numbers etc.. Custom type is for arbitrary variables needed by the Rock-on that may not map to a system resource." rel="tooltip"></i></th>
<th>Name&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Name of the resource according to Rockstor. Eg: Share names, port numbers etc.." rel="tooltip"></i></th>
<th>Mapped representation&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Name/representation of the resource inside the Rock-on. Eg: Shares map to directories, ports map to (possibly different)ports to send traffic to the Rock-on, etc.." rel="tooltip"></i></th>
<th>Resource type&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Eg: Share, Port, Environmental variable etc. Custom type is for arbitrary variables needed by the Rock-on that may not map to an external resource." rel="tooltip"></i></th>
<th>Internal Reference&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Resource reference from inside the Rock-on/docker-containers. E.g.: internal directories, internal port numbers, Environmental variable names, etc.." rel="tooltip"></i></th>
<th>External Reference / Configured value&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Rockstor's reference for the given resource. E.g.: mapped Share, external Port, Environment variable value configured, etc.." rel="tooltip"></i></th>
</tr>
</thead>
{{#each share_map}}
<tr>
<td>Share</td>
<td>{{@key}}</td>
<td>{{this}}</td>
<td>{{@key}}</td>
</tr>
{{/each}}
{{#each port_map}}
<tr>
<td>Port</td>
<td>{{@key}}</td>
<td>{{this}}</td>
<td>{{@key}}</td>
</tr>
{{/each}}
{{#each cc_map}}
Expand All @@ -30,7 +30,7 @@
{{#each dev_map}}
<tr>
<td>Device</td>
<td>{{@dev}}</td>
<td>{{@key}}</td>
<td>{{this}}</td>
</tr>
{{/each}}
Expand Down