dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #04989
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1670: fixed typo in javascript and added lists filter to missing pages
------------------------------------------------------------
revno: 1670
fixes bug(s): https://launchpad.net/bugs/540908
committer: Saptarshi <sunbiz@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-03-19 00:56:19 +0100
message:
fixed typo in javascript and added lists filter to missing pages
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.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-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js 2010-03-12 14:29:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js 2010-03-18 23:56:19 +0000
@@ -115,7 +115,7 @@
for ( id in groupMembers )
{
- $("#groupMembers").append( $( "<option></option>" ).attr( "value",id ).text( groupMember[id] )) ;
+ $("#groupMembers").append( $( "<option></option>" ).attr( "value",id ).text( groupMembers[id] )) ;
}
for ( id in availableDataElements )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js 2010-03-11 13:32:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js 2010-03-18 23:56:19 +0000
@@ -29,7 +29,6 @@
// ========================================================================
function initAllList()
{
- var list = document.getElementById( 'dataElementGroups' );
var id;
for ( id in dataElementGroups )
@@ -38,10 +37,10 @@
option.onmousemove = function(e){
showToolTip( e, this.text);
}
- list.add( option, null );
+ $("#dataElementGroups").append(option);
}
- list = document.getElementById( 'availableDataElements' );
+ var list = document.getElementById( 'availableDataElements' );
for ( id in availableDataElements )
{
@@ -49,7 +48,7 @@
option.onmousemove = function(e){
showToolTip( e, this.text);
}
- list.add( option, null );
+ $("#availableDataElements").append(option);
}
if(list.selectedIndex==-1)
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js 2010-03-11 13:32:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js 2010-03-18 23:56:19 +0000
@@ -29,7 +29,6 @@
// ========================================================================
function initAllList()
{
- var list = document.getElementById( 'availableGroups' );
var id;
for ( id in availableGroups )
@@ -38,18 +37,16 @@
option.onmousemove = function(e){
showToolTip( e, this.text);
}
- list.add( option, null );
+ $("#availableGroups").append(option);
}
- list = document.getElementById( 'availableDataElements' );
-
for ( id in availableDataElements )
{
var option = new Option( availableDataElements[id], id );
option.onmousemove = function(e){
showToolTip( e, this.text);
}
- list.add( option, null );
+ $("#availableDataElements").append(option);
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm 2010-02-09 09:10:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm 2010-03-18 23:56:19 +0000
@@ -45,9 +45,9 @@
<th>$i18n.getString( "available_data_elements" )</th><td></td><th>$i18n.getString( "group_members" )</th>
</tr>
<tr>
- <td><input type="text" id="availableDataElementsFilter" onkeyup="filterAvailableDataElements()" style="width:25em"></td>
+ <td><input type="text" id="availableDataElementsFilter" onkeyup="filterList( this.value, 'availableDataElements' )" style="width:25em"></td>
<td style="text-align:center">< $i18n.getString( "filters" ) ></td>
- <td><input type="text" id="groupMembersFilter" onkeyup="filterGroupMembers()" style="width:25em"></td>
+ <td><input type="text" id="groupMembersFilter" onkeyup="filterList( this.value, 'groupMembers' )" style="width:25em"></td>
</tr>
<tr>
<td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2010-02-17 13:38:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2010-03-18 23:56:19 +0000
@@ -42,9 +42,9 @@
<th>$i18n.getString( "available_dataelementgroup" )</th><td></td><th>$i18n.getString( "group_members" )</th>
</tr>
<tr>
- <td><input type="text" id="availableDataElementGroupsFilter" onkeyup="filterAvailableDataElementGroups()" style="width:25em"></td>
+ <td><input type="text" id="availableDataElementGroupsFilter" onkeyup="filterList( this.value, 'availableDataElements' )" style="width:25em"></td>
<td style="text-align:center">< $i18n.getString( "filters" ) ></td>
- <td><input type="text" id="groupMembersFilter" onkeyup="filterGroupMembers()" style="width:25em"></td>
+ <td><input type="text" id="groupMembersFilter" onkeyup="filterList( this.value, 'groupMembers' )" style="width:25em"></td>
</tr>
<tr>
<td>