dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #27045
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13408: Minor
------------------------------------------------------------
revno: 13408
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-12-23 17:25:40 +0100
message:
Minor
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowDataElementFormAction.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2013-12-23 16:16:42 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2013-12-23 16:25:40 +0000
@@ -1073,35 +1073,6 @@
*/
dhis2.de.getCategories = function( dataSetId )
{
- /**
- * Returns markup for drop down boxes to be put in the selection box for the
- * given categories. The empty string is returned if no categories are given.
- */
- dhis2.de.getAttributesMarkup = function()
- {
- var html = '';
-
- if ( !dhis2.de.currentCategories || dhis2.de.currentCategories.length == 0 ) {
- return html;
- }
-
- $.safeEach( dhis2.de.currentCategories, function( idx, category ) {
- html += '<div class="selectionBoxRow">';
- html += '<div class="selectionLabel">' + category.name + '</div> ';
- html += '<select id="category-' + category.id + '" class="selectionBoxSelect" onchange="dhis2.de.attributeSelected(\'' + category.id + '\')">';
- html += '<option value="-1">[ ' + i18n_select_option + ' ]</option>';
-
- $.safeEach( category.options, function( idx, option ) {
- html += '<option value="' + option.id + '">' + option.name + '</option>';
- } );
-
- html += '</select>';
- html += '</div>';
- } );
-
- return html;
- };
-
var dataSet = dhis2.de.dataSets[dataSetId];
if ( !dataSet || !dataSet.categoryCombo || dhis2.de.defaultCategoryCombo === dataSet.categoryCombo ) {
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowDataElementFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowDataElementFormAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowDataElementFormAction.java 2013-12-23 16:25:40 +0000
@@ -217,7 +217,7 @@
.getDataElementCategoryComboByName( DataElementCategoryCombo.DEFAULT_CATEGORY_COMBO_NAME );
dataElementCategoryCombos = new ArrayList<DataElementCategoryCombo>( dataElementCategoryService
- .getAllDataElementCategoryCombos() );
+ .getDisaggregationCategoryCombos() );
dataElementGroups = dataElementService.getAllDataElementGroups();