Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r353fe07604639c2166ed68fbf832810959f3f3cf -rbb0a38ce3c757b6d0c296cfc055d40565a20227d Binary files differ Index: lams_central/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== diff -u -r168ff333f872c5be5ed7d96d7c591aed8dff80c3 -rbb0a38ce3c757b6d0c296cfc055d40565a20227d --- lams_central/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag (.../AuthoringRatingAllStyleCriteria.tag) (revision 168ff333f872c5be5ed7d96d7c591aed8dff80c3) +++ lams_central/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag (.../AuthoringRatingAllStyleCriteria.tag) (revision bb0a38ce3c757b6d0c296cfc055d40565a20227d) @@ -196,9 +196,15 @@ reactivateArrows(); } - function generateSelect(id, validate, zeroDescription, orderId, currentValue) { - var str = ''; + if ( zeroDescription ) { + str += ''; + } for (var i = 1; i < 11; i++) { str += ''; } @@ -263,12 +269,7 @@ } else if ( style == 2 ) { var rankingStr = '
 ' - + '
'; + + generateSelect('maxRating' + orderId, null, null, orderId, maxRating); row.append(jQuery('', { 'class': 'criteria-info', html: '
'+ inputField + rankingStr @@ -330,7 +331,25 @@ var maxRateDropDown = document.getElementById("maximumRates" + orderId); var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value); - if ((minLimit > maxLimit) && !(maxLimit == 0)) { + // RANK ALL + if ( minLimit == -1 || maxLimit == -1 ) { + if ( isMinimum ) { + if ( minLimit == -1 ) { + maxRateDropDown.selectedIndex = 0; + } else { + maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex; + } + } else { + if ( maxLimit == -1 ) { + minRateDropDown.selectedIndex = 0; + } else { + minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; + } + } + } + + // OTHERWISE MIN <= MAX + else if ((minLimit > maxLimit) && !(maxLimit == 0)) { if (isMinimum) { minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; } else {