------------------------------------------------------------
revno: 11374
committer: Tran Chau <tran.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Wed 2013-07-10 09:51:49 +0700
message:
Fix bug - Don't filter data elements in Add/Update program indicator form.
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/defaultPatientRegistationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programIndicatorForm.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-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2013-07-03 15:40:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2013-07-10 02:51:49 +0000
@@ -1150,7 +1150,7 @@
class="org.hisp.dhis.patient.action.program.GetProgramAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/addProgramIndicator.vm</param>
- <param name="javascripts">javascript/programIndicator.js</param>
+ <param name="javascripts">javascript/commons.js,javascript/programIndicator.js</param>
<param name="requiredAuthorities">F_ADD_PROGRAM_INDICATOR</param>
</action>
@@ -1165,7 +1165,7 @@
class="org.hisp.dhis.patient.action.programtindicator.GetProgramIndicatorAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-patient/updateProgramIndicator.vm</param>
- <param name="javascripts">javascript/programIndicator.js</param>
+ <param name="javascripts">javascript/commons.js,javascript/programIndicator.js</param>
<param name="requiredAuthorities">F_UPDATE_PROGRAM_INDICATOR</param>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/defaultPatientRegistationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/defaultPatientRegistationForm.vm 2013-07-09 06:32:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/defaultPatientRegistationForm.vm 2013-07-10 02:51:49 +0000
@@ -5,7 +5,7 @@
});
byId('name').focus();
-});
+});
</script>
<h3>$i18n.getString( "create_default_registration_form" )</h3>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programIndicatorForm.vm 2013-04-17 08:20:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programIndicatorForm.vm 2013-07-10 02:51:49 +0000
@@ -17,7 +17,7 @@
</tr>
<tr>
<td>
- <select id="dataElements" name="dataElements" size="8" ondblclick="insertDataElement(this);"></select>
+ <select id="dataElements" name="dataElements" size="8" style="height:120px;" ondblclick="insertDataElement(this);"></select>
</td>
</tr>
</table>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
