L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-MDL-36112-master' of git://github.com/abgreeve/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2012-11-07 15:06:36 +08:00
parent 20aea2ea0d 24054bb28a
commit 092977fb0b
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/data/field/url/field.class.php
+3 -3
View File
@@ -54,17 +54,17 @@ class data_field_url extends data_field_base {
$str .= '<table><tr><td align="right">';
$str .= get_string('url','data').':</td><td>';
$str .= '<label class="accesshide" for="' . $fieldid . '">'. $this->field->name .'</label>';
$str .= '<input type="text" name="field_'.$this->field->id.'_0" id="'.$fieldid.'" value="'.$url.'" size="60" /></td></tr>';
$str .= '<input type="text" name="field_'.$this->field->id.'_0" id="'.$fieldid.'" value="'.$url.'" size="60" />';
$str .= '<button id="filepicker-button-'.$options->client_id.'" style="display:none">'.$straddlink.'</button></td></tr>';
$str .= '<tr><td align="right">'.get_string('text','data').':</td><td><input type="text" name="field_'.$this->field->id.'_1" id="field_'.$this->field->id.'_1" value="'.s($text).'" size="60" /></td></tr>';
$str .= '</table>';
} else {
// Just the URL field
$str .= '<label class="accesshide" for="' . $fieldid . '">'. $this->field->name .'</label>';
$str .= '<input type="text" name="field_'.$this->field->id.'_0" id="'.$fieldid.'" value="'.s($url).'" size="60" />';
$str .= '<button id="filepicker-button-'.$options->client_id.'" style="display:none">'.$straddlink.'</button>';
}
$str .= '<button id="filepicker-button-'.$options->client_id.'" style="display:none">'.$straddlink.'</button>';
// print out file picker
//$str .= $OUTPUT->render($fp);
mod/data/import.php
+4 -1
View File
@@ -159,7 +159,10 @@ if (!$formdata = $form->get_data()) {
if (preg_match("/^(latlong|url)$/", $field->type)) {
$values = explode(" ", $value, 2);
$content->content = $values[0];
$content->content1 = $values[1];
// The url field doesn't always have two values (unforced autolinking).
if (count($values) > 1) {
$content->content1 = $values[1];
}
} else {
$content->content = $value;
}