Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'MDL-46500_master' of https://github.com/dmonllao/moodle
  • Loading branch information
Damyon Wiese committed Nov 5, 2014
2 parents 93a4f8b + 57a69e7 commit ec57e8b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 37 deletions.
10 changes: 7 additions & 3 deletions mod/data/edit.php
Expand Up @@ -297,9 +297,13 @@
///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});
Expand Down
17 changes: 0 additions & 17 deletions mod/data/field/file/field.class.php
Expand Up @@ -87,23 +87,6 @@ function display_add_field($recordid=0) {
$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;
}

Expand Down
17 changes: 0 additions & 17 deletions mod/data/field/picture/field.class.php
Expand Up @@ -101,23 +101,6 @@ function display_add_field($recordid=0) {
$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;
}

Expand Down

0 comments on commit ec57e8b

Please sign in to comment.