Skip to content

Commit

Permalink
MDL-7812 warning in sorting form in data module when no fields define…
Browse files Browse the repository at this point in the history
…d; backported from HEAD
  • Loading branch information
skodak committed Dec 6, 2006
1 parent 319e0b4 commit 5ceee28
Showing 1 changed file with 24 additions and 24 deletions.
48 changes: 24 additions & 24 deletions mod/data/field.php
Original file line number Diff line number Diff line change
Expand Up @@ -297,32 +297,32 @@
helpbutton('fields', get_string('addafield','data'), 'data');
echo '</div>';

echo '<div class="sortdefault" align="center">';
echo '<form name="sortdefault" action="'.$CFG->wwwroot.'/mod/data/field.php" method="get">';
echo '<input type="hidden" name="d" value="'.$data->id.'" />';
echo '<input type="hidden" name="mode" value="sort" />';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
echo '&nbsp;'.get_string('defaultsortfield','data').':';
$fields = get_records('data_fields','dataid',$data->id);
echo '<select name="defaultsort"><option value="0">'.get_string('dateentered','data').'</option>';
foreach ($fields as $field) {
if ($field->id == $data->defaultsort) {
echo '<option value="'.$field->id.'" selected="selected">'.$field->name.'</option>';
} else {
echo '<option value="'.$field->id.'">'.$field->name.'</option>';
if ($fields = get_records('data_fields','dataid',$data->id)) {
echo '<div class="sortdefault" align="center">';
echo '<form name="sortdefault" action="'.$CFG->wwwroot.'/mod/data/field.php" method="get">';
echo '<input type="hidden" name="d" value="'.$data->id.'" />';
echo '<input type="hidden" name="mode" value="sort" />';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
echo '&nbsp;'.get_string('defaultsortfield','data').':';
echo '<select name="defaultsort"><option value="0">'.get_string('dateentered','data').'</option>';
foreach ($fields as $field) {
if ($field->id == $data->defaultsort) {
echo '<option value="'.$field->id.'" selected="selected">'.$field->name.'</option>';
} else {
echo '<option value="'.$field->id.'">'.$field->name.'</option>';
}
}
echo '</select>';
echo '&nbsp;';

$options = array(0 => get_string('ascending', 'data'),
1 => get_string('descending', 'data'));
choose_from_menu($options, 'defaultsortdir', $data->defaultsortdir, '');
echo '<input type="submit" value="'.get_string('go').'" />';

echo '</form>';
echo '</div>';
}
echo '</select>';

echo '&nbsp;';

$options = array(0 => get_string('ascending', 'data'),
1 => get_string('descending', 'data'));
choose_from_menu($options, 'defaultsortdir', $data->defaultsortdir, '');
echo '<input type="submit" value="'.get_string('go').'" />';

echo '</form>';
echo '</div>';


}
Expand Down

0 comments on commit 5ceee28

Please sign in to comment.