------------------------------------------------------------
revno: 567
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Thu 2009-09-03 22:04:45 +0200
message:
Fixed bug #423949
modified:
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/hibernate/HibernateResourceTableStore.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.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-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/hibernate/HibernateResourceTableStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/hibernate/HibernateResourceTableStore.java 2009-06-14 19:43:19 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/hibernate/HibernateResourceTableStore.java 2009-09-03 20:04:45 +0000
@@ -38,6 +38,7 @@
import org.hisp.dhis.resourcetable.OrganisationUnitStructure;
import org.hisp.dhis.resourcetable.ResourceTableStore;
import org.hisp.dhis.resourcetable.statement.CreateExclusiveGroupSetTableStatement;
+import org.springframework.jdbc.BadSqlGrammarException;
import org.springframework.jdbc.core.JdbcTemplate;
/**
@@ -166,6 +167,13 @@
public void removeExclusiveGroupSetStructureTable()
{
- jdbcTemplate.update( "DROP TABLE " + CreateExclusiveGroupSetTableStatement.TABLE_NAME );
+ try
+ {
+ jdbcTemplate.update( "DROP TABLE " + CreateExclusiveGroupSetTableStatement.TABLE_NAME );
+ }
+ catch ( BadSqlGrammarException ex )
+ {
+ // Do nothing, table does not exist
+ }
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm 2009-05-13 15:51:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm 2009-09-03 20:04:45 +0000
@@ -3,22 +3,22 @@
<p>
<input type="checkbox" id="organisationUnit">
- <label for="organisationUnit">$i18n.getString( "organisation_unit_structure" )</label>
+ <label for="organisationUnit">$i18n.getString( "organisation_unit_structure" ) <span style="color:#606060">(orgunitstructure)</span></label>
</p>
<p>
<input type="checkbox" id="groupSet">
- <label for="groupSet">$i18n.getString( "group_set_structure" )</label>
+ <label for="groupSet">$i18n.getString( "group_set_structure" ) <span style="color:#060606">(orgunitgroupsetstructure)</span></label>
</p>
<p>
<input type="checkbox" id="exclusiveGroupSet">
- <label for="exclusiveGroupSet">$i18n.getString( "exclusive_group_set_structure" )</label>
+ <label for="exclusiveGroupSet">$i18n.getString( "exclusive_group_set_structure" ) <span style="color:#606060">(orgunitgroupsetexclusivestructure)</span></label>
</p>
<p>
<input type="checkbox" id="categoryOptionComboName">
- <label for="groupSet">$i18n.getString( "data_element_category_option_combo_name" )</label>
+ <label for="groupSet">$i18n.getString( "data_element_category_option_combo_name" ) <span style="color:#606060">(orgunitgroupsetstructure)</span></label>
</p>
<p>
_______________________________________________
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
