Commit aa071c28 authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1583416: allowing setlimit dropdown for copy page list 



behatnotneeded

Change-Id: I9b0f9e4e804cdd582a70ace810ae09fc4ff84606
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
parent 71635b9d

htdocs/lib/view.php

+2 −1
Original line number Diff line number Diff line
@@ -5610,7 +5610,7 @@ class View { 
        if (!empty($search->collection)) {

            $params['searchcollection'] = $search->collection;

        }

        $params['viewlimit'] = $search->limit;

        $params['limit'] = $search->limit;



        $smarty = smarty_core();

        $smarty->assign_by_ref('results', $results->data);
@@ -5631,6 +5631,7 @@ class View { 
            'previoustext' => '',

            'nexttext' => '',

            'lasttext' => '',

            'setlimit' => true,

            'resultcounttextsingular' => get_string('view', 'view'),

            'resultcounttextplural' => get_string('views', 'view'),

        ));

htdocs/theme/raw/templates/view/choosetemplate.tpl

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,11 @@ 
            {$views->html|safe}

        </div>

        {$views->pagination.html|safe}

        {if $views->pagination.javascript}

            <script type="application/javascript">

            {$views->pagination.javascript|safe}

            </script>

        {/if}

    </div>

</div>

htdocs/view/choosetemplate.php

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ $views = new StdClass; 
$views->query      = trim(param_variable('viewquery', ''));

$views->ownerquery = trim(param_variable('ownerquery', ''));

$views->offset     = param_integer('viewoffset', 0);

$views->limit      = param_integer('viewlimit', 10);

$views->limit      = param_integer('limit', 10);

$views->copyableby = (object) array('group' => $groupid, 'institution' => $institution, 'owner' => null);

if ($groupid) {

    $views->group = $groupid;
@@ -134,7 +134,7 @@ addLoadEvent(function() { 
EOF;



$smarty = smarty(

    array('js/preview.js', 'searchtable'),

    array('js/preview.js', 'searchtable', 'paginator'),

    array(),

    array('stylesheets' => array('style/views.css'))

);

htdocs/view/templatesearch.json.php

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ $views = new StdClass; 
$views->query       = trim(param_variable('viewquery', ''));

$views->ownerquery  = trim(param_variable('ownerquery', ''));

$views->offset      = param_integer('viewoffset', 0);

$views->limit       = param_integer('viewlimit', 10);

$views->limit       = param_integer('limit', 10);

$views->group       = param_integer('group', null);

$views->institution = param_alphanum('institution', null);

$views->copyableby = (object) array('group' => $group, 'institution' => $institution);