Skip to content

GitLab

mahara
mahara
Commit 511d5a8c authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files
Options

Merge "Bug 1531610: Fixing up missed 'notes' page js pagination" into 16.04_STABLE

parents 8127b5b0 6b635982
Hide whitespace changes
Inline Side-by-side
Showing with 357 additions and 105 deletions
htdocs/artefact/internal/notes.json.php 0 → 100644
View file @ 511d5a8c
<?php
/**
*
* @package mahara
* @subpackage artefact-internal
* @author Catalyst IT Ltd
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later
* @copyright For copyright information on Mahara, please see the README file distributed with this software.
*/
define('INTERNAL', 1);
define('JSON', 1);
require(dirname(dirname(dirname(__FILE__))) . '/init.php');
require_once('pieforms/pieform.php');
safe_require('artefact', 'internal');
require_once('view.php');
$offset = param_integer('offset', 0);
$limit = param_integer('limit', 10);
$setlimit = param_boolean('setlimit', false);
$baseurl = get_config('wwwroot') . 'artefact/internal/notes.php';
$params = array();
if ($group = param_integer('group', null)) {
define('MENUITEM', 'groups');
define('GROUP', $group);
require_once('group.php');
if (!group_user_can_edit_views($group, $USER->get('id'))) {
throw new AccessDeniedException(get_string('accessdenied', 'error'));
}
$groupobj = group_current_group();
$pageheading = get_string('notesfor', 'artefact.internal', $groupobj->name);
$where = '"group" = ?';
$values = array($group);
$params['group'] = $group;
}
else if ($institution = param_alpha('institution', null)) {
if ($institution == 'mahara') {
define('ADMIN', 1);
define('MENUITEM', 'configsite');
$pageheading = get_string('Notes', 'artefact.internal');
}
else {
define('INSTITUTIONALADMIN', 1);
define('MENUITEM', 'manageinstitutions');
require_once('institution.php');
$institutionobj = new Institution($institution);
$pageheading = get_string('notesfor', 'artefact.internal', $institutionobj->displayname);
}
if (!$USER->can_edit_institution($institution)) {
throw new AccessDeniedException(get_string('accessdenied', 'error'));
}
$where = 'institution = ?';
$values = array($institution);
$params['institution'] = $institution;
}
else {
define('MENUITEM', 'content/notes');
$pageheading = get_string('mynotes', 'artefact.internal');
$where = 'owner = ?';
$values = array($USER->get('id'));
}
if ($params) {
$baseurl .= '?' . http_build_query($params);
}
$where .= ' AND artefacttype = ?';
$values[] = 'html';
$count = count_records_select('artefact', $where, $values);
$data = get_records_select_assoc(
'artefact', $where, $values,
'title, id', '*', $offset, $limit
);
// Get blocks
if ($data) {
$blocks = get_records_sql_assoc('
SELECT
bi.id AS block, bi.title AS blocktitle,
va.artefact,
va.view, v.title AS viewtitle, v.owner, v.group, v.institution, v.ownerformat, v.urlid
FROM
{block_instance} bi
JOIN {view_artefact} va ON bi.id = va.block
JOIN {view} v ON va.view = v.id
WHERE
va.artefact IN (' . join(',', array_fill(0, count($data), '?')) . ')
ORDER BY va.view, bi.title',
array_keys($data)
);
if ($blocks) {
$viewdata = array();
foreach ($blocks as $b) {
if (!isset($viewdata[$b->view])) {
$viewdata[$b->view] = (object) array(
'id' => $b->view,
'title' => $b->viewtitle,
'owner' => $b->owner,
'group' => $b->group,
'institution' => $b->institution,
'ownerformat' => $b->ownerformat,
'urlid' => $b->urlid,
);
}
}
View::get_extra_view_info($viewdata, false, false);
foreach ($blocks as $b) {
if (!isset($data[$b->artefact]->views)) {
$data[$b->artefact]->views = array();
}
if (!isset($data[$b->artefact]->views[$b->view])) {
$data[$b->artefact]->views[$b->view] = array(
'view' => $b->view,
'viewtitle' => $b->viewtitle,
'fullurl' => $viewdata[$b->view]['fullurl'],
);
// Add the view owner's name if it's not the same as the note owner. This will either
// be a group artefact inside an individual's view, or it's an institution/site artefact.
if ((!empty($params['group']) && $b->owner)
|| (!empty($params['institution']) && $params['institution'] != $b->institution)) {
if ($b->owner) {
$ownername = display_default_name($viewdata[$b->view]['user']);
$ownerurl = profile_url($viewdata[$b->view]['user']);
}
else if ($b->group) {
$ownername = $viewdata[$b->view]['groupdata']['name'];
$ownerurl = group_homepage_url($viewdata[$b->view]['groupdata']);
}
else if ($b->institution == 'mahara') {
$ownername = get_config('sitename');
}
else {
$ownername = $b->institutionname;
$ownerurl = get_config('wwwroot') . 'institution/index.php?institution=' . $b->institution;
}
$data[$b->artefact]->views[$b->view]['ownername'] = $ownername;
$data[$b->artefact]->views[$b->view]['ownerurl'] = $ownerurl;
}
}
if (!isset($data[$b->artefact]->blocks)) {
$data[$b->artefact]->blocks = array();
}
if (!isset($data[$b->artefact]->blocks[$b->block])) {
$data[$b->artefact]->blocks[$b->block] = (array)$b;
(!isset($data[$b->artefact]->views[$b->view]['extrablocks'])) ? $data[$b->artefact]->views[$b->view]['extrablocks'] = 0 : $data[$b->artefact]->views[$b->view]['extrablocks'] ++;
}
if (!isset($data[$b->artefact]->tags)) {
$data[$b->artefact]->tags = ArtefactType::artefact_get_tags($b->artefact);
}
}
}
foreach ($data as $id => $n) {
$n->deleteform = pieform(deletenote_form($id, $n));
}
}
// Get the attached files.
$noteids = array();
if ($data) {
$noteids = array_keys($data);
}
$files = ArtefactType::attachments_from_id_list($noteids);
if ($files) {
safe_require('artefact', 'file');
foreach ($files as $file) {
$file->icon = call_static_method(generate_artefact_class_name($file->artefacttype), 'get_icon', array('id' => $file->attachment));
$data[$file->artefact]->files[] = $file;
}
}
// Add Attachments count for each Note
if ($data) {
foreach ($data as $item) {
$item->count = isset($item->files) ? count($item->files) : 0;
}
}
$pagination = build_pagination(array(
'id' => 'notes_pagination',
'url' => $baseurl,
'datatable' => 'notes',
'count' => $count,
'limit' => $limit,
'offset' => $offset,
'jsonscript' => 'artefact/internal/notes.json.php',
'setlimit' => true,
'jumplinks' => 6,
'numbersincludeprevnext' => 2,
));
$smarty = smarty_core();
$smarty->assign_by_ref('data', $data);
$html = $smarty->fetch('artefact:internal:noteresults.tpl');
function deletenote_form($id, $notedata) {
global $THEME;
$form = array(
'name' => 'delete_' . $id,
'successcallback' => 'deletenote_submit',
'class' => 'form-as-button',
'elements' => array(
'delete' => array(
'type' => 'hidden',
'value' => $id,
),
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default btn-xs last',
'elementtitle' => get_string('delete'),
'value' => '<span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span> ',
),
),
);
if (!empty($notedata->blocks)) {
$form['elements']['submit']['confirm'] = get_string(
'confirmdeletenote', 'artefact.internal',
count($notedata->blocks), count($notedata->views)
);
}
return $form;
}
json_reply(false, array(
'message' => null,
'data' => array(
'tablerows' => $html,
'pagination' => $pagination['html'],
'pagination_js' => $pagination['javascript'],
'count' => $count,
'results' => $count . ' ' . ($count == 1 ? get_string('result') : get_string('results')),
'offset' => $offset,
'setlimit' => $setlimit,
)
));
\ No newline at end of file
htdocs/artefact/internal/notes.php
View file @ 511d5a8c
......@@ -186,6 +186,10 @@ $pagination = build_pagination(array(
'count' => $count,
'limit' => $limit,
'offset' => $offset,
'jsonscript' => 'artefact/internal/notes.json.php',
'setlimit' => true,
'jumplinks' => 6,
'numbersincludeprevnext' => 2,
));
$js = '
......@@ -196,11 +200,14 @@ jQuery(function($) {
});
});';
$smarty = smarty();
$smarty = smarty(array('paginator'));
$smarty->assign('PAGEHEADING', $pageheading);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign_by_ref('data', $data);
$smarty->assign('pagination', $pagination);
$html = $smarty->fetch('artefact:internal:noteresults.tpl');
$smarty->assign('datarows', $html);
$smarty->assign('pagination', $pagination['html']);
$smarty->assign('pagination_js', $pagination['javascript']);
$smarty->display('artefact:internal:notes.tpl');
function deletenote_form($id, $notedata) {
......
htdocs/theme/raw/plugintype/artefact/internal/templates/noteresults.tpl 0 → 100755
View file @ 511d5a8c
{foreach from=$data item=n}
<tr class="{cycle values='r1,r0'} {if $n->locked}warning{/if}">
<td class="note-name">
{if $n->locked}
<h3>
<a class="notetitle" href="" id="n{$n->id}">
{$n->title}
<span class="accessible-hidden sr-only">
{str tag=clickformore}
</span>
</a>
</h3>
{else}
<h3>
<a class="notetitle" href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" id="n{$n->id}">
{$n->title}
<span class="accessible-hidden sr-only">
{str tag=clickformore}
</span>
</a>
</h3>
{/if}
<div id="n{$n->id}_desc" class="hidden">
<p>
{$n->description|clean_html|safe}
</p>
{if $n->files}
<div id="notefiles_{$n->id}" class="has-attachment">
<p>
<span class="icon left icon-paperclip" role="presentation" aria-hidden="true"></span>
<strong>
{str tag=attachedfiles section=artefact.blog}
</strong>
</p>
<ul class="list-group list-group-unbordered">
{foreach from=$n->files item=file}
<li class="list-group-item list-group-item-link small">
<a href="{$WWWROOT}artefact/file/download.php?file={$file->attachment}" {if $file->description} title="{$file->description}" data-toggle="tooltip"{/if}>
{if $file->icon}
<img src="{$file->icon}" alt="" class="file-icon">
{else}
<span class="icon icon-{$file->artefacttype} icon-lg text-default left" role="presentation" aria-hidden="true"></span>
{/if}
<span>{$file->title|truncate:40} - ({$file->size|display_size})</span>
</a>
</li>
{/foreach}
</ul>
</div>
{/if}
</div>
{if $n->tags}
<div class="tags text-small">
<strong>{str tag=tags}</strong>: {list_tags tags=$n->tags owner=$n->owner}
</div>
{/if}
</td>
<td class="note-titled"><label class="hidden">{str tag=currenttitle section=artefact.internal}: </label>
{foreach from=$n->blocks item=b}
<div class="detail">
{$b.blocktitle}
</div>
{/foreach}
</td>
<td class="note-containedin"><label class="hidden">{str tag=containedin section=artefact.internal}: </label>
{foreach from=$n->views item=v}
<div class="detail">
<a href="{$v.fullurl}">{$v.viewtitle}</a>
{if $v.ownername} - {str tag=by section=view} {if $v.ownerurl}<a href="{$v.ownerurl}">{/if}{$v.ownername}{if $v.ownerurl}</a>{/if}{/if}
</div>
{if $v.extrablocks}
{for i 1 $v.extrablocks}
<div class="detail">&nbsp;</div>
{/for}
{/if}
{/foreach}
</td>
<td class="note-attachment">
<label class="hidden">
{str tag=Attachments section=artefact.resume}:
</label>
{$n->count}
</td>
<td class="control-buttons">
{if $n->locked}
<span class="dull text-muted">
{str tag=Submitted section=view}
</span>
{else}
<div class="btn-group">
<a href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" title="{str tag=edit}" class="btn btn-default btn-xs">
<span class="icon icon-lg icon-pencil" role="presentation" aria-hidden="true"></span>
<span class="sr-only">
{str(tag=editspecific arg1=$n->title)|escape:html|safe}
</span>
</a>
{if $n->deleteform}{$n->deleteform|safe}{/if}
</div>
{/if}
</td>
</tr>
{/foreach}
\ No newline at end of file
htdocs/theme/raw/plugintype/artefact/internal/templates/notes.tpl
View file @ 511d5a8c
......@@ -21,110 +21,14 @@
</tr>
</thead>
<tbody>
{foreach from=$data item=n}
<tr class="{cycle values='r1,r0'} {if $n->locked}warning{/if}">
<td class="note-name">
{if $n->locked}
<h3>
<a class="notetitle" href="" id="n{$n->id}">
{$n->title}
<span class="accessible-hidden sr-only">
{str tag=clickformore}
</span>
</a>
</h3>
{else}
<h3>
<a class="notetitle" href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" id="n{$n->id}">
{$n->title}
<span class="accessible-hidden sr-only">
{str tag=clickformore}
</span>
</a>
</h3>
{/if}
<div id="n{$n->id}_desc" class="hidden">
<p>
{$n->description|clean_html|safe}
</p>
{if $n->files}
<div id="notefiles_{$n->id}" class="has-attachment">
<p>
<span class="icon left icon-paperclip" role="presentation" aria-hidden="true"></span>
<strong>
{str tag=attachedfiles section=artefact.blog}
</strong>
</p>
<ul class="list-group list-group-unbordered">
{foreach from=$n->files item=file}
<li class="list-group-item list-group-item-link small">
<a href="{$WWWROOT}artefact/file/download.php?file={$file->attachment}" {if $file->description} title="{$file->description}" data-toggle="tooltip"{/if}>
{if $file->icon}
<img src="{$file->icon}" alt="" class="file-icon">
{else}
<span class="icon icon-{$file->artefacttype} icon-lg text-default left" role="presentation" aria-hidden="true"></span>
{/if}
<span>{$file->title|truncate:40} - ({$file->size|display_size})</span>
</a>
</li>
{/foreach}
</ul>
</div>
{/if}
</div>
{if $n->tags}
<div class="tags text-small">
<strong>{str tag=tags}</strong>: {list_tags tags=$n->tags owner=$n->owner}
</div>
{/if}
</td>
<td class="note-titled"><label class="hidden">{str tag=currenttitle section=artefact.internal}: </label>
{foreach from=$n->blocks item=b}
<div class="detail">
{$b.blocktitle}
</div>
{/foreach}
</td>
<td class="note-containedin"><label class="hidden">{str tag=containedin section=artefact.internal}: </label>
{foreach from=$n->views item=v}
<div class="detail">
<a href="{$v.fullurl}">{$v.viewtitle}</a>
{if $v.ownername} - {str tag=by section=view} {if $v.ownerurl}<a href="{$v.ownerurl}">{/if}{$v.ownername}{if $v.ownerurl}</a>{/if}{/if}
</div>
{if $v.extrablocks}
{for i 1 $v.extrablocks}
<div class="detail">&nbsp;</div>
{/for}
{/if}
{/foreach}
</td>
<td class="note-attachment">
<label class="hidden">
{str tag=Attachments section=artefact.resume}:
</label>
{$n->count}
</td>
<td class="control-buttons">
{if $n->locked}
<span class="dull text-muted">
{str tag=Submitted section=view}
</span>
{else}
<div class="btn-group">
<a href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" title="{str tag=edit}" class="btn btn-default btn-xs">
<span class="icon icon-lg icon-pencil" role="presentation" aria-hidden="true"></span>
<span class="sr-only">
{str(tag=editspecific arg1=$n->title)|escape:html|safe}
</span>
</a>
{if $n->deleteform}{$n->deleteform|safe}{/if}
</div>
{/if}
</td>
</tr>
{/foreach}
{$datarows|safe}
</tbody>
</table>
</div>
{$pagination.html|safe}
{$pagination|safe}
{if $pagination_js}
<script type="application/javascript">
{$pagination_js|safe}
</script>
{/if}
{include file="footer.tpl"}
Markdown is supported
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