Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
380ee53a
Commit
380ee53a
authored
Nov 27, 2015
by
Robert Lyon
Committed by
Gerrit Code Review
Nov 27, 2015
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Bug 1515484: Fix the institution page list pagination to use json"
parents
2424c585
f053fad7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
htdocs/json/viewlist.php
htdocs/json/viewlist.php
+6
-0
htdocs/view/institutionviews.php
htdocs/view/institutionviews.php
+3
-1
No files found.
htdocs/json/viewlist.php
View file @
380ee53a
...
...
@@ -20,6 +20,8 @@ $offset = param_integer('offset', 0);
$limit
=
param_integer
(
'limit'
,
0
);
$setlimit
=
param_boolean
(
'setlimit'
,
false
);
$groupid
=
param_integer
(
'group'
,
null
);
$institution
=
param_alpha
(
'institution'
,
null
);
$orderby
=
param_alphanum
(
'orderby'
,
null
);
if
(
!
empty
(
$groupid
))
{
define
(
'PUBLIC'
,
1
);
...
...
@@ -75,6 +77,10 @@ if (!empty($groupid)) {
$createviewform
=
pieform
(
create_view_form
(
$group
->
id
));
}
}
else
if
(
!
empty
(
$institution
))
{
define
(
'INSTITUTIONALADMIN'
,
1
);
list
(
$searchform
,
$data
,
$pagination
)
=
View
::
views_by_owner
(
null
,
$institution
);
}
else
{
list
(
$searchform
,
$data
,
$pagination
)
=
View
::
views_by_owner
();
}
...
...
htdocs/view/institutionviews.php
View file @
380ee53a
...
...
@@ -79,9 +79,11 @@ $smarty->assign('institutionselector', $s['institutionselector']);
$smarty
->
assign
(
'INLINEJAVASCRIPT'
,
$js
);
$smarty
->
assign
(
'views'
,
$data
->
data
);
$smarty
->
assign
(
'institution'
,
$institution
);
$smarty
->
assign
(
'querystring'
,
get_querystring
());
$html
=
$smarty
->
fetch
(
'view/indexresults.tpl'
);
$smarty
->
assign
(
'viewresults'
,
$html
);
$smarty
->
assign
(
'pagination'
,
$pagination
[
'html'
]);
$smarty
->
assign
(
'query'
,
param_variable
(
'query'
,
null
));
$smarty
->
assign
(
'querystring'
,
get_querystring
());
$smarty
->
assign
(
'searchform'
,
$searchform
);
$smarty
->
assign
(
'createviewform'
,
$createviewform
);
$smarty
->
display
(
'view/index.tpl'
);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment