dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30817
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15671: Add uid property in the last property in the details area for objects in dhis-web-validation-rule...
------------------------------------------------------------
revno: 15671
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-06-13 16:33:45 +0800
message:
Add uid property in the last property in the details area for objects in dhis-web-validation-rule module.
modified:
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/general.js
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/validationRuleGroup.js
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/jsonValidationRule.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/jsonValidationRuleGroup.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.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-validationrule/src/main/webapp/dhis-web-validationrule/javascript/general.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/general.js 2013-12-06 13:37:28 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/general.js 2014-06-13 08:33:45 +0000
@@ -7,6 +7,7 @@
{
jQuery.post( 'getValidationRule.action', { id: context.id }, function ( json ) {
setText( 'nameField', json.validationRule.name );
+ setText( 'idField', json.validationRule.uid );
var description = json.validationRule.description;
setText( 'descriptionField', description ? description : '[' + i18n_none + ']' );
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/validationRuleGroup.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/validationRuleGroup.js 2014-03-28 01:51:34 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/validationRuleGroup.js 2014-06-13 08:33:45 +0000
@@ -13,6 +13,7 @@
setInnerHTML('descriptionField', json.validationRuleGroup.description);
setInnerHTML('memberCountField', json.validationRuleGroup.memberCount);
setInnerHTML('userGroupsToAlertCountField', json.validationRuleGroup.userGroupsToAlertCount);
+ setInnerHTML('idField', json.validationRuleGroup.uid);
showDetails();
});
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/jsonValidationRule.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/jsonValidationRule.vm 2013-10-08 17:20:57 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/jsonValidationRule.vm 2014-06-13 08:33:45 +0000
@@ -1,6 +1,7 @@
{ "validationRule":
{
"name": "$!encoder.jsonEncode( ${validationRule.name} )",
+ "uid": "$!encoder.jsonEncode( ${validationRule.uid} )",
"description": "$!encoder.jsonEncode( ${validationRule.description} )",
"type": "$!encoder.jsonEncode( ${validationRule.type} )",
"importance": "$!encoder.jsonEncode( ${validationRule.importance} )",
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/jsonValidationRuleGroup.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/jsonValidationRuleGroup.vm 2014-03-28 01:51:34 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/jsonValidationRuleGroup.vm 2014-06-13 08:33:45 +0000
@@ -1,10 +1,11 @@
{ "validationRuleGroup":
{
"id": "$!{validationRuleGroup.id}",
+ "uid": "$!{validationRuleGroup.uid}",
"name": "$!encoder.jsonEncode( ${validationRuleGroup.name} )",
"description": "$!encoder.jsonEncode( ${validationRuleGroup.description} )",
"memberCount": "${validationRuleGroup.members.size()}",
"userGroupsToAlertCount": "$!{validationRuleGroup.userGroupsToAlert.size()}",
- "alertByOrgUnits": $!{validationRuleGroup.alertByOrgUnits}"
+ "alertByOrgUnits": "$!{validationRuleGroup.alertByOrgUnits}"
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm 2013-12-06 13:37:28 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm 2014-06-13 08:33:45 +0000
@@ -71,7 +71,6 @@
<table class="listTable" id="listTable">
<col/>
<col/>
- <col/>
<col width="120px">
<thead>
<tr>
@@ -114,6 +113,7 @@
<p><label>$i18n.getString( "left_side_description" ):</label><br><span id="leftSideDescriptionField"></span></p>
<p><label>$i18n.getString( "operator" ):</label><br><span id="operatorField"></span></p>
<p><label>$i18n.getString( "right_side_description" ):</label><br><span id="rightSideDescriptionField"></span></p>
+ <p><label>$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
</div>
<div id="warningArea">
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.vm 2014-03-28 01:51:34 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.vm 2014-06-13 08:33:45 +0000
@@ -67,6 +67,7 @@
<p><label>$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
<p><label>$i18n.getString( "number_of_members" ):</label><br><span id="memberCountField"></span></p>
<p><label>$i18n.getString( "number_of_user_groups_to_alert" ):</label><br><span id="userGroupsToAlertCountField"></span></p>
+ <p><label>$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
</div>
<div id="warningArea">
