#3346 www: display load/capacity at hosts page
Merged 2 years ago by tkopecek. Opened 2 years ago by tkopecek.
tkopecek/koji issuee3345  into  master

file modified
+8 -4
@@ -41,7 +41,7 @@ 

    <h4>$headerState($state) $headerReady($ready) $headerArch($arch) $headerChannel($channel)</h4>

    <table class="data-list">

      <tr>

-       <td colspan="7">

+       <td colspan="9">

          <table class="nested">

            <tr><td>

                <strong>State</strong>:
@@ -85,7 +85,7 @@ 

        </td>

      </tr>

      <tr>

-       <td class="paginate" colspan="7">

+       <td class="paginate" colspan="9">

          #if $len($hostPages) > 1

          <form class="pageJump" action="">

            Page:
@@ -114,6 +114,8 @@ 

        <th><a href="hosts?order=$util.toggleOrder($self, 'channels')$util.passthrough_except($self, 'order')">Channels</a> $util.sortImage($self, 'channels')</th>

        <th><a href="hosts?order=$util.toggleOrder($self, 'enabled')$util.passthrough_except($self, 'order')">Enabled?</a> $util.sortImage($self, 'enabled')</th>

        <th><a href="hosts?order=$util.toggleOrder($self, 'ready')$util.passthrough_except($self, 'order')">Ready?</a> $util.sortImage($self, 'ready')</th>

+       <th><a href="hosts?order=$util.toggleOrder($self, 'task_load')$util.passthrough_except($self, 'order')">Load</a> $util.sortImage($self, 'task_load')</th>

+       <th><a href="hosts?order=$util.toggleOrder($self, 'capacity')$util.passthrough_except($self, 'order')">Cap.</a> $util.sortImage($self, 'capacity')</th>

        <th><a href="hosts?order=$util.toggleOrder($self, 'last_update')$util.passthrough_except($self, 'order')">Last Update</a> $util.sortImage($self, 'last_update')</th>

      </tr>

      #if $len($hosts) > 0
@@ -129,16 +131,18 @@ 

            </td>

            <td class="$str($bool($host.enabled)).lower()">#if $host.enabled then $util.imageTag('yes') else $util.imageTag('no')#</td>

            <td class="$str($bool($host.ready)).lower()">#if $host.ready then $util.imageTag('yes') else $util.imageTag('no')#</td>

+           <td>$host.task_load</td>

+           <td>$host.capacity</td>

            <td>$util.formatTime($host.last_update)</td>

          </tr>

        #end for

      #else

        <tr class="row-odd">

-         <td colspan="7">No hosts</td>

+         <td colspan="9">No hosts</td>

        </tr>

      #end if

      <tr>

-       <td class="paginate" colspan="7">

+       <td class="paginate" colspan="9">

          #if $len($hostPages) > 1

          <form class="pageJump" action="">

            Page:

Metadata Update from @tkopecek:
- Pull-request tagged with: testing-ready

2 years ago

Metadata Update from @jobrauer:
- Pull-request tagged with: testing-done

2 years ago

Commit c1b45d3 fixes this pull-request

Pull-Request has been merged by tkopecek

2 years ago