dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18992
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8112: minor bugfix in filtering of sections
------------------------------------------------------------
revno: 8112
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-09-17 16:06:22 +0700
message:
minor bugfix in filtering of sections
modified:
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/select.vm
--
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 2012-09-16 15:38:31 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2012-09-17 09:06:22 +0000
@@ -455,6 +455,7 @@
function enableSectionFilter()
{
var $sectionsHeaders = $( '.formSection .cent h3' );
+ $( '#filterDataSetSection' ).children().remove();
if ( $sectionsHeaders.size() > 1)
{
@@ -472,7 +473,6 @@
{
$( '#selectionBox' ).css( 'height', '93px' );
$( '#filterDataSetSectionTr' ).hide();
- $( '#filterDataSetSection' ).children().remove();
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2012-09-13 04:01:07 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2012-09-17 09:06:22 +0000
@@ -56,7 +56,7 @@
<tr>
<td><label for="selectedOrganisationUnit">$i18n.getString( "organisation_unit" )</label></td>
<td><input type="text" id="selectedOrganisationUnit" readonly="readonly" value="[ $i18n.getString( 'select_from_tree' ) ]" style="width:367px"></td>
- </tr>
+ </tr>
<tr>
<td><label for="selectedDataSetId">$i18n.getString( "data_set" )</label></td>
<td><select id="selectedDataSetId" name="selectedDataSetId" style="width:371px" onchange="dataSetSelected()" disabled="disabled"></select>