mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-46500_master' of https://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Damyon Wiese 2014-11-05 16:52:07 +08:00
commit ec57e8b3f4
3 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod/data/edit.php
View File

@ -297,9 +297,13 @@ if ($data->addtemplate){
///then we generate strings to replace
foreach ($possiblefields as $eachfield){
$field = data_get_field($eachfield, $data);
$patterns[]="[[".$field->field->name."]]";
$replacements[] = $field->display_add_field($rid);
$patterns[]="[[".$field->field->name."#id]]";
// To skip unnecessary calls to display_add_field().
if (strpos($data->addtemplate, "[[".$field->field->name."]]") !== false) {
$patterns[] = "[[".$field->field->name."]]";
$replacements[] = $field->display_add_field($rid);
}
$patterns[] = "[[".$field->field->name."#id]]";
$replacements[] = 'field_'.$field->field->id;
}
$newtext = str_ireplace($patterns, $replacements, $data->{$mode});

17
mod/data/field/file/field.class.php
View File

@ -87,23 +87,6 @@ class data_field_file extends data_field_base {
$html .= '</fieldset>';
$html .= '</div>';
$module = array(
'name'=>'form_filemanager',
'fullpath'=>'/lib/form/filemanager.js',
'requires' => array('core_filepicker', 'base', 'io-base', 'node',
'json', 'core_dndupload', 'panel', 'resize-plugin', 'dd-plugin'),
'strings' => array(
array('error', 'moodle'), array('info', 'moodle'), array('confirmdeletefile', 'repository'),
array('draftareanofiles', 'repository'), array('entername', 'repository'), array('enternewname', 'repository'),
array('invalidjson', 'repository'), array('popupblockeddownload', 'repository'),
array('unknownoriginal', 'repository'), array('confirmdeletefolder', 'repository'),
array('confirmdeletefilewithhref', 'repository'), array('confirmrenamefolder', 'repository'),
array('confirmrenamefile', 'repository'), array('edit', 'moodle')
)
);
$PAGE->requires->js_init_call('M.form_filemanager.init', array($fm->options), true, $module);
return $html;
}

17
mod/data/field/picture/field.class.php
View File

@ -101,23 +101,6 @@ class data_field_picture extends data_field_base {
$str .= '</fieldset>';
$str .= '</div>';
$module = array(
'name'=>'form_filemanager',
'fullpath'=>'/lib/form/filemanager.js',
'requires' => array('core_filepicker', 'base', 'io-base', 'node',
'json', 'core_dndupload', 'panel', 'resize-plugin', 'dd-plugin'),
'strings' => array(
array('error', 'moodle'), array('info', 'moodle'), array('confirmdeletefile', 'repository'),
array('draftareanofiles', 'repository'), array('entername', 'repository'), array('enternewname', 'repository'),
array('invalidjson', 'repository'), array('popupblockeddownload', 'repository'),
array('unknownoriginal', 'repository'), array('confirmdeletefolder', 'repository'),
array('confirmdeletefilewithhref', 'repository'), array('confirmrenamefolder', 'repository'),
array('confirmrenamefile', 'repository'), array('edit', 'moodle')
)
);
$PAGE->requires->js_init_call('M.form_filemanager.init', array($fm->options), true, $module);
return $str;
}