moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-33640 - change $templatesinitialized to an array; improve naming and automate use of template

Browse source 
* $templatesinitialized is now an array, so that subsequent calls to initialise_filepicker which request different repositories will include those (and only those) templates which it requires but have not yet been included
* The get_template method has also been renamed to get_upload_template (and the template to "uploadform_" followed by the repository type), since it only applies to upload forms
* If a plugin provides a get_upload_template method, the template it returns will now automatically be used instead of the standard uploadform template when generating an upload form
This commit is contained in:
Paul Nicholls 2012-08-09 09:43:53 +12:00
parent 013cf2878c
commit ec3eaa2c38
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
repository/filepicker.js
View file

@ -1618,8 +1618,9 @@ M.core_filepicker.init = function(Y, options) {
var client_id = this.options.client_id;
var id = data.upload.id+'_'+client_id;
var content = this.fpnode.one('.fp-content');
var template = data.template || 'uploadform';
content.setContent(M.core_filepicker.templates[template]);
var template_name = 'uploadform_'+this.options.repositories[data.repo_id].type;
var template = M.core_filepicker.templates[template_name] || M.core_filepicker.templates['uploadform'];
content.setContent(template);
content.all('.fp-file,.fp-saveas,.fp-setauthor,.fp-setlicense').each(function (node) {
node.all('label').set('for', node.one('input,select').generateID());

15
repository/lib.php
View file

@ -2614,7 +2614,7 @@ final class repository_type_form extends moodleform {
*/
function initialise_filepicker($args) {
global $CFG, $USER, $PAGE, $OUTPUT;
static $templatesinitialized;
static $templatesinitialized = array();
require_once($CFG->libdir . '/licenselib.php');
$return = new stdClass();
@ -2691,16 +2691,19 @@ function initialise_filepicker($args) {
// JavaScript a lot, the key NEEDS to be the repository id.
$return->repositories[$repository->id] = $meta;
// Register custom repository template if it has one
if(method_exists($repository, 'get_template')) {
$templates[$meta->type] = $repository->get_template();
if(method_exists($repository, 'get_upload_template') && !array_key_exists('uploadform_' . $meta->type, $templatesinitialized)) {
$templates['uploadform_' . $meta->type] = $repository->get_upload_template();
$templatesinitialized['uploadform_' . $meta->type] = true;
}
}
if (!$templatesinitialized) {
// we need to send filepicker templates to the browser just once
if (!array_key_exists('core', $templatesinitialized)) {
// we need to send each filepicker template to the browser just once
$fprenderer = $PAGE->get_renderer('core', 'files');
$templates = array_merge($templates, $fprenderer->filepicker_js_templates());
$templatesinitialized['core'] = true;
}
if (sizeof($templates)) {
$PAGE->requires->js_init_call('M.core_filepicker.set_templates', array($templates), true);
$templatesinitialized = true;
}
return $return;
}