Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1346760 by xjm, droplet, catch: Fixed Drag and drop needs a scalable weight select element.

8.0.x
Nathaniel 2011-12-02 14:05:37 +09:00
parent 15ddbd887f
commit d8c739586b
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/includes/form.inc
View File

@ -3792,13 +3792,27 @@ function theme_password($variables) {
* Expand weight elements into selects. * Expand weight elements into selects.
*/ */
function form_process_weight($element) { function form_process_weight($element) {
for ($n = (-1 * $element['#delta']); $n <= $element['#delta']; $n++) {
$weights[$n] = $n;
}
$element['#options'] = $weights;
$element['#type'] = 'select';
$element['#is_weight'] = TRUE; $element['#is_weight'] = TRUE;
$element += element_info('select');
// If the number of options is small enough, use a select field.
$max_elements = variable_get('drupal_weight_select_max', DRUPAL_WEIGHT_SELECT_MAX);
if ($element['#delta'] <= $max_elements) {
$element['#type'] = 'select';
for ($n = (-1 * $element['#delta']); $n <= $element['#delta']; $n++) {
$weights[$n] = $n;
}
$element['#options'] = $weights;
$element += element_info('select');
}
// Otherwise, use a text field.
else {
$element['#type'] = 'textfield';
// Use a field big enough to fit most weights.
$element['#size'] = 10;
$element['#element_validate'] = array('element_validate_integer');
$element += element_info('textfield');
}
return $element; return $element;
} }

7
core/modules/system/system.module
View File

@ -45,6 +45,13 @@ const DRUPAL_OPTIONAL = 1;
*/ */
const DRUPAL_REQUIRED = 2; const DRUPAL_REQUIRED = 2;
/**
* Maximum number of values in a weight select element.
*
* If the number of values is over the maximum, a text field is used instead.
*/
const DRUPAL_WEIGHT_SELECT_MAX = 100;
/** /**
* Return only visible regions. * Return only visible regions.
* *