Commit 061b1e41 authored by Kristina Hoeppner's avatar Kristina Hoeppner Committed by Robert Lyon
Browse files

Bug 1694908: Fix URL for user search

- The URL was incorrect and resulted in an error message.
- Added missing adminusersearch.js

behatnotneeded

Change-Id: I02c59c2f67bf051803c479ea6b466e547aea2724
parent 9fa3c03a
...@@ -55,9 +55,8 @@ jQuery(document).ready(function() { ...@@ -55,9 +55,8 @@ jQuery(document).ready(function() {
}) })
EOF; EOF;
$smarty = smarty(array('adminexportqueue','paginator'), array(), array('ascending' => 'mahara', 'descending' => 'mahara')); $smarty = smarty(array('adminusersearch', 'adminexportqueue','paginator'), array(), array('ascending' => 'mahara', 'descending' => 'mahara'));
setpageicon($smarty, 'icon-users'); setpageicon($smarty, 'icon-users');
$smarty->assign('search', $search); $smarty->assign('search', $search);
$smarty->assign('limit', $limit); $smarty->assign('limit', $limit);
$smarty->assign('institutions', $institutions); $smarty->assign('institutions', $institutions);
......
...@@ -692,13 +692,13 @@ function build_admin_export_queue_results($search, $offset, $limit) { ...@@ -692,13 +692,13 @@ function build_admin_export_queue_results($search, $offset, $limit) {
'exportselect' => array( 'exportselect' => array(
'headhtml' => get_string('requeue', 'export') . '<br><div class="btn-group" role="group"><a class="btn btn-xs btn-default" href="" id="selectallexport">' . get_string('All') . '</a>&nbsp;<a class="btn btn-xs btn-default" href="" id="selectnoneexport">' . get_string('none') . '</a></div>', 'headhtml' => get_string('requeue', 'export') . '<br><div class="btn-group" role="group"><a class="btn btn-xs btn-default" href="" id="selectallexport">' . get_string('All') . '</a>&nbsp;<a class="btn btn-xs btn-default" href="" id="selectnoneexport">' . get_string('none') . '</a></div>',
'template' => 'admin/users/searchselectcolumnexport.tpl', 'template' => 'admin/users/searchselectcolumnexport.tpl',
'class' => 'nojs-hidden-table-cell with-checkbox', 'class' => 'nojs-hidden-table-cell with-selectall',
'accessible' => get_string('bulkselect'), 'accessible' => get_string('bulkselect'),
), ),
'deleteselect' => array( 'deleteselect' => array(
'headhtml' => get_string('delete') . '<br><div class="btn-group" role="group"><a class="btn btn-xs btn-default" href="" id="selectalldelete">' . get_string('All') . '</a>&nbsp;<a class="btn btn-xs btn-default" href="" id="selectnonedelete">' . get_string('none') . '</a></div>', 'headhtml' => get_string('delete') . '<br><div class="btn-group" role="group"><a class="btn btn-xs btn-default" href="" id="selectalldelete">' . get_string('All') . '</a>&nbsp;<a class="btn btn-xs btn-default" href="" id="selectnonedelete">' . get_string('none') . '</a></div>',
'template' => 'admin/users/searchselectcolumnexportdelete.tpl', 'template' => 'admin/users/searchselectcolumnexportdelete.tpl',
'class' => 'nojs-hidden-table-cell with-checkbox', 'class' => 'nojs-hidden-table-cell with-selectall',
'accessible' => get_string('bulkselect'), 'accessible' => get_string('bulkselect'),
), ),
); );
......
...@@ -209,6 +209,9 @@ table.table tr { ...@@ -209,6 +209,9 @@ table.table tr {
float:left; float:left;
} }
} }
.with-selectall {
min-width: 110px;
}
} }
.table > thead > tr.th-has-shared > th { .table > thead > tr.th-has-shared > th {
......
{include file="header.tpl"} {include file="header.tpl"}
<form class="form-inline pieform form with-heading" action="{$WWWROOT}admin/groups/archive.php" method="post"> <form class="form-inline pieform form with-heading" action="{$WWWROOT}admin/groups/archives.php" method="post">
{if $search->sortby} {if $search->sortby}
<input type="hidden" name="sortby" id="sortby" value="{$search->sortby}"> <input type="hidden" name="sortby" id="sortby" value="{$search->sortby}">
{/if} {/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