------------------------------------------------------------
revno: 11103
committer: Tran Chau <[email protected]>
branch nick: dhis2
timestamp: Thu 2013-05-30 10:47:35 +0700
message:
Hide Indentifier and Attribute tab if user not have authority to access
private attribute in tabular report.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js
--
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-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2013-05-24 04:19:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2013-05-30 03:47:35 +0000
@@ -30,7 +30,7 @@
obj.system.level.push({value: r.levels[i].value, name: r.levels[i].name});
}
- obj.system.accessPatientAttributes = r.accessPatientAttributes;
+ obj.system.accessPatientAttributes = r.user.accessPatientAttributes;
return obj;
}
@@ -6456,16 +6456,7 @@
TR.init.initialize(vp);
TR.cmp.options.window = TR.app.OptionsWindow();
TR.cmp.options.window.hide();
-
- if( TR.init.system.accessPatientAttributes=='false')
- {
- Ext.getCmp('patientPropertiesDiv').setVisible(false);
- }
- else
- {
- Ext.getCmp('patientPropertiesDiv').setVisible(true);
- }
-
+ Ext.getCmp('patientPropertiesDiv').setVisible(TR.init.system.accessPatientAttributes);
Ext.getCmp('reportTypeGroup').setValue(true);
Ext.getCmp('limitOption').setVisible(false);
dataElementTabTitle.innerHTML = TR.i18n.data_elements;
@@ -6481,7 +6472,6 @@
Ext.getCmp('displayTotalsOpt').setVisible(false);
Ext.getCmp('caseBasedFavoriteBtn').setVisible(true);
Ext.getCmp('levelCombobox').setVisible(true);
- Ext.getCmp('patientPropertiesDiv').setVisible(true);
Ext.getCmp('dateRangeDiv').setVisible(true);
Ext.getCmp('relativePeriodsDiv').setVisible(false);
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
