dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5887
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-02-08 19:39:22 +0700
message:
  minor changes..
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateLockExceptionForm.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-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java	2012-02-08 12:04:46 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java	2012-02-08 12:39:22 +0000
@@ -236,7 +236,7 @@
      * Add new lock exception
      *
      * @param lockException LockException instance to add
-     * @return
+     * @return Database ID of LockException
      */
     public int addLockException( LockException lockException );
 
@@ -277,11 +277,11 @@
     public Collection<LockException> getAllLockExceptions();
 
     /**
-     * Get all LockExceptions withing a specific range
+     * Get all LockExceptions within a specific range
      *
      * @param first Index to start at
      * @param max   Number of results wanted
-     * @return Collection of LockExceptions withing the range specificed
+     * @return Collection of LockExceptions withing the range specified
      */
     public Collection<LockException> getLockExceptionsBetween( int first, int max );
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2012-02-08 12:16:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2012-02-08 12:39:22 +0000
@@ -398,3 +398,4 @@
 lock_exception=Lock Exception
 confirm_delete_lock_exception=Do you want to delete this lock exception?
 create_new_lock_exception=Create new lock exception
+edit_lock_exception=Edit lock exception

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateLockExceptionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateLockExceptionForm.vm	2012-02-08 12:04:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateLockExceptionForm.vm	2012-02-08 12:39:22 +0000
@@ -13,9 +13,25 @@
 	<col style="width: 100px"/>
 	<col/>
 
-	<tr>
-		<th colspan="2">$i18n.getString( "details" )</th>
-	</tr>
+    <tr>
+        <td>#organisationUnitSelectionTree( true, false, true )</td>
+    </tr>
+
+    <tr>
+        <td>
+            <select id="dataSets" name="dataSetId" disabled="disabled" style="width: 100%;">
+                <option>-- Please select an organisation unit --</option>
+            </select>
+        </td>
+    </tr>
+
+    <tr>
+        <td>
+            <select id="periods" name="periodId" disabled="disabled" style="width: 100%;">
+                <option>-- Please select a dataset--</option>
+            </select>
+        </td>
+    </tr>
 
 	<tr>
 		<td colspan="2">