From: moodler Date: Wed, 22 Mar 2006 09:53:13 +0000 (+0000) Subject: Tweaky tweaky tweak X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b6ffdddaa5a373634c3222fd57b650b0413d3d5a;p=moodle.git Tweaky tweaky tweak --- diff --git a/mod/data/fields.php b/mod/data/fields.php index fd05a7a8b1..d31550f520 100755 --- a/mod/data/fields.php +++ b/mod/data/fields.php @@ -139,16 +139,17 @@ if ($confirm = optional_param('confirm', 0, PARAM_INT)) { // Delete the field completely - $field = data_get_field_from_id($fid, $data); - $field->delete_field(); - - // Update the templates. - data_replace_field_in_templates($data, $field->field->name, ''); - - add_to_log($course->id, 'data', 'fields delete', - "fields.php?d=$data->id", $field->field->name, $cm->id); - - $displaynoticegood = get_string('fielddeleted', 'data'); + if ($field = data_get_field_from_id($fid, $data)) { + $field->delete_field(); + + // Update the templates. + data_replace_field_in_templates($data, $field->field->name, ''); + + add_to_log($course->id, 'data', 'fields delete', + "fields.php?d=$data->id", $field->field->name, $cm->id); + + $displaynoticegood = get_string('fielddeleted', 'data'); + } } else { // Print confirmation message. @@ -200,15 +201,9 @@ } else { /// Display the main listing of all fields - echo '
'; - echo get_string('newfield','data').': '; - popup_form($CFG->wwwroot.'/mod/data/fields.php?d='.$data->id.'&mode=new&sesskey='. - sesskey().'&newtype=', $menufield, 'fieldform', '', 'choose'); - helpbutton('fields', get_string('addafield','data'), 'data'); - echo '
'; if (!record_exists('data_fields','dataid',$data->id)) { - print_string('nofieldindatabase','data'); // nothing in database + notify(get_string('nofieldindatabase','data')); // nothing in database } else { //else print quiz style list of fields @@ -242,6 +237,13 @@ print_table($table); } + echo '
'; + echo get_string('newfield','data').': '; + popup_form($CFG->wwwroot.'/mod/data/fields.php?d='.$data->id.'&mode=new&sesskey='. + sesskey().'&newtype=', $menufield, 'fieldform', '', 'choose'); + helpbutton('fields', get_string('addafield','data'), 'data'); + echo '
'; + print_simple_box_end(); }