On 12 March 2010 12:10, Saptarshi Purkayastha <sun...@gmail.com> wrote:
> don't blame me for those extra spaces in the diff that's being shown
> I'm using the code style which Bob gave ;-) ... and that applied those extra
> spaces
Good to have someone to blame :-) BTW I don't think I changed what
netbeans does to xml formatting. But having said that, the real style
problem below is the fact that you have all that whitespace in
character data which shouldn't be there. I suspect it would be better
as:
<action name="emptyOrgunitSetupAssociationsTree"
class="org.hisp.dhis.commons.action.NoAction">
<result
name="success"
type="velocity">/dhis-web-maintenance-dataadmin/noResponseInFrame.vm</result>
<param
name="javascripts">javascript/oust.js,javascript/associations.js,javascript/locking.js</param>
</action>
Netbeans generally doesn't seem too smart about xml formatting.
Cheers
Bob
>
> ---
> Regards,
> Saptarshi PURKAYASTHA
> Director R & D, HISP India
> Health Information Systems Programme
>
> My Tech Blog: http://sunnytalkstech.blogspot.com
> You Live by CHOICE, Not by CHANCE
>
>
> On 12 March 2010 13:04, <nore...@launchpad.net> wrote:
>>
>> ------------------------------------------------------------
>> revno: 1639
>> committer: Saptarshi <sun...@gmail.com>
>> branch nick: trunk
>> timestamp: Fri 2010-03-12 13:03:07 +0100
>> message:
>> fixes to get ajax return on periods
>> modified:
>>
>> dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml
>>
>>
>> --
>> 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-dataadmin/src/main/resources/struts.xml'
>> ---
>> dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml
>> 2010-02-01 15:30:27 +0000
>> +++
>> dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml
>> 2010-03-12 12:03:07 +0000
>> @@ -145,7 +145,7 @@
>> <action name="getPeriodsForLock"
>>
>> class="org.hisp.dhis.dataadmin.action.lock.GetPeriodsForLockAction">
>> <result name="success" type="velocity">
>> -
>> /dhis-web-commons/ajax/responsePeriod.vm</result>
>> +
>> /dhis-web-commons/ajax/xmlPeriods.vm</result>
>> <param
>> name="onExceptionReturn">plainTextError</param>
>> </action>
>>
>> @@ -307,8 +307,8 @@
>> <action name="mergeOrganisationUnits"
>>
>> class="org.hisp.dhis.dataadmin.action.organisationunitmerge.MergeOrganisationUnitsAction">
>> <result name="success" type="redirect">
>> -
>> displayOrganisationUnitMergeForm.action</result>
>> - </action>
>> +
>> displayOrganisationUnitMergeForm.action</result>
>> + </action>
>>
>> <!-- Duplicate data elimination -->
>>
>> @@ -322,9 +322,9 @@
>> <action name="eliminateDuplicateData"
>>
>> class="org.hisp.dhis.dataadmin.action.duplicatedataelimination.EliminateDuplicateDataAction">
>> <result name="success" type="redirect">
>> - displayDuplicateDataEliminationForm.action</result>
>> + displayDuplicateDataEliminationForm.action</result>
>> </action>
>> -
>> +
>> <!-- Data Element Zero Value Storage Management -->
>>
>> <action name="zeroValueStorageManagement"
>>
>>
>> _______________________________________________
>> 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
>>
>
>
> _______________________________________________
> 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
>
>
_______________________________________________
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
