Commit 5252f8f0 authored by Liam's avatar Liam Committed by Robert Lyon
Browse files

Bug #1796525: Portfolio access report should indicate portfolios that are under review

behatnotneeded

Change-Id: Ic438d8cd00047e708f3846921cfeb2e644703392
parent 1a81d018
...@@ -111,7 +111,7 @@ th { ...@@ -111,7 +111,7 @@ th {
// Default zebra-stripe styles (alternating gray and transparent backgrounds) // Default zebra-stripe styles (alternating gray and transparent backgrounds)
.table-striped { .table-striped {
> tbody > tr:nth-child(odd) { > tbody > tr:nth-child(odd):not(.bg-danger) {
background-color: $table-bg-accent; background-color: $table-bg-accent;
} }
} }
......
...@@ -1534,7 +1534,7 @@ EOF; ...@@ -1534,7 +1534,7 @@ EOF;
$labelclass = ''; $labelclass = '';
} }
$nolabeltypes = array('radio', 'emaillist', 'date', 'files', 'checkboxes', 'bytes'); $nolabeltypes = array('radio', 'emaillist', 'date', 'files', 'checkboxes', 'bytes');
if ($element['type'] == 'select' && !empty($element['collapseifoneoption']) && count($element['options']) < 2) { if ($element['type'] == 'select' && !empty($element['collapseifoneoption']) && !empty($element['options']) && count($element['options']) < 2) {
// we are using a select field as a hidden field // we are using a select field as a hidden field
$element['nolabel'] = true; $element['nolabel'] = true;
} }
......
...@@ -3734,6 +3734,7 @@ function accesslist_stats_table($limit, $offset, $extra, $institution, $urllink) ...@@ -3734,6 +3734,7 @@ function accesslist_stats_table($limit, $offset, $extra, $institution, $urllink)
FROM {view_access} va WHERE va.view = ? AND va.token IS NOT NULL LIMIT 1)", FROM {view_access} va WHERE va.view = ? AND va.token IS NOT NULL LIMIT 1)",
array($item->viewid, $item->viewid)); array($item->viewid, $item->viewid));
$item->hasaccessrules = !empty($item->access); $item->hasaccessrules = !empty($item->access);
$item->pending = is_view_suspended($item->viewid);
} }
if (!empty($extra['csvdownload'])) { if (!empty($extra['csvdownload'])) {
......
{foreach from=$data item=item} {foreach from=$data item=item}
<tr class="{cycle values='r0,r1'}"> <tr class="{cycle values='r0,r1'} {if $item->pending}bg-danger{/if}">
{if $columns.rownum}<td>{$offset + $dwoo.foreach.default.iteration}</td>{/if} {if $columns.rownum}<td>{$offset + $dwoo.foreach.default.iteration}</td>{/if}
{if $columns.owner}<td><a href="{$item->userurl}">{$item->displayname}</a></td>{/if} {if $columns.owner}<td><a href="{$item->userurl}">{$item->displayname}</a></td>{/if}
{if $columns.views}<td> {if $columns.views}<td>
{if $item->views > 0}<a href="{$WWWROOT}view/view.php?id={$item->viewid}">{/if} {if $item->views > 0}{if $item->pending}<div class="detail text-danger"><strong>{str tag="pending" section="view"}</strong></div>{/if}<a href="{$WWWROOT}view/view.php?id={$item->viewid}">{/if}
{$item->title} {$item->title}
{if $item->views > 0}</a>{/if} {if $item->views > 0}</a>{/if}
</td>{/if} </td>{/if}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment