dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16882
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-09-30 18:27:28 +0200
message:
  Option set management, added code column to list of options
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/option.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/optionSet.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-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/option.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/option.vm	2014-08-29 15:16:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/option.vm	2014-09-30 16:27:28 +0000
@@ -46,21 +46,22 @@
 				</tr>		
 			</table>
       <table class="listTable">
-      <col/>
+      <col width="60%"/>
+      <col width="40%"/>
       <thead>
       <tr>
           <th>$i18n.getString( "name" )</th>
+          <th>$i18n.getString( "code" )</th>
       </tr>
       </thead>
       <tbody id="list">
       #foreach( $option in $options )
-      <tr id="tr${option.id}">
-        <td data-id="$!option.id" data-uid="$!option.uid" data-type="Option" data-name="$encoder.htmlEncode( $!option.displayName )"
+      <tr id="tr${option.id}" data-id="$!option.id" data-uid="$!option.uid" data-type="Option" data-name="$encoder.htmlEncode( $!option.displayName )"
           data-can-manage="$security.canManage( $option )"
           data-can-update="$security.canUpdate( $option )"
           data-can-delete="$security.canDelete( $option )">
-          $encoder.htmlEncode( $!option.displayName )
-        </td>
+          <td>$encoder.htmlEncode( $!option.displayName )</td>
+          <td>$encoder.htmlEncode( $!option.code )</td>
       </tr>
       #end
       </tbody>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/optionSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/optionSet.vm	2014-07-29 07:52:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/optionSet.vm	2014-09-30 16:27:28 +0000
@@ -49,13 +49,11 @@
       </thead>
       <tbody id="list">
       #foreach( $optionSet in $optionSets )
-      <tr id="tr${optionSet.id}">
-        <td data-id="$!optionSet.id" data-uid="$!optionSet.uid" data-type="OptionSet" data-name="$encoder.htmlEncode( $!optionSet.displayName )"
+      <tr id="tr${optionSet.id}" data-id="$!optionSet.id" data-uid="$!optionSet.uid" data-type="OptionSet" data-name="$encoder.htmlEncode( $!optionSet.displayName )"
           data-can-manage="$security.canManage( $optionSet )"
           data-can-update="$security.canUpdate( $optionSet )"
           data-can-delete="$security.canDelete( $optionSet )">
-          $encoder.htmlEncode( $!optionSet.displayName )
-        </td>
+          <td>$encoder.htmlEncode( $!optionSet.displayName )</td>
       </tr>
       #end
       </tbody>