dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11618
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-08-08 17:14:50 +0200
message:
  Chart hibernate mapping, using the identifiable object include
modified:
  dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml
  dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/HibernateOutboundSmsStore.java


--
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-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml	2013-07-04 15:41:57 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml	2013-08-08 15:14:50 +0000
@@ -13,15 +13,10 @@
     <id name="id" column="chartid">
       <generator class="native" />
     </id>
+    &identifiableProperties;
 
     <property name="name" column="name" not-null="true" length="230" />
 
-    <property name="uid" column="uid" length="11" />
-
-    <property name="created" type="timestamp" />
-
-    <property name="lastUpdated" type="timestamp" />
-
     <property name="domainAxisLabel" />
 
     <property name="rangeAxisLabel" />

=== modified file 'dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/HibernateOutboundSmsStore.java'
--- dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/HibernateOutboundSmsStore.java	2013-08-08 06:59:54 +0000
+++ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/HibernateOutboundSmsStore.java	2013-08-08 15:14:50 +0000
@@ -60,7 +60,6 @@
     public int saveOutboundSms( OutboundSms sms )
     {
         checkDate( sms );
-        //return (Integer) sessionFactory.getCurrentSession().save( sms );
         return save( sms );
     }
 
@@ -75,8 +74,6 @@
     @Override
     public OutboundSms getOutboundSmsbyId( int id )
     {
-        /*Session session = sessionFactory.getCurrentSession();
-        return (OutboundSms) session.get( OutboundSms.class, id );*/
         return get( id );
     }
 
@@ -84,8 +81,6 @@
     @SuppressWarnings( "unchecked" )
     public List<OutboundSms> getAllOutboundSms()
     {
-        /*Session session = sessionFactory.getCurrentSession();
-        return session.createCriteria( OutboundSms.class ).addOrder( Order.desc( "date" ) ).list();*/
         return getCriteria().addOrder( Order.desc( "date" ) ).list();
     }
 
@@ -138,13 +133,11 @@
     public void updateOutboundSms( OutboundSms sms )
     {
         update( sms );
-        //sessionFactory.getCurrentSession().update( sms );
     }
 
     @Override
     public void deleteOutboundSms( OutboundSms sms )
     {
         delete( sms );
-        //sessionFactory.getCurrentSession().delete( sms );
     }
 }