Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 14475 [merge]
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: dhis2
timestamp: Thu 2014-03-27 10:48:29 +0100
message:
ER, minor fixes.
modified:
dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/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-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-03-26 15:32:14 +0000
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-03-26 16:17:52 +0000
@@ -423,7 +423,7 @@
enableKeyEvents: true,
queryMode: 'local',
listConfig: {
- minWidth: 300
+ minWidth: 304
},
store: this.valueStore,
listeners: {
@@ -470,7 +470,7 @@
Ext.Ajax.request({
url: ns.core.init.contextPath + '/api/optionSets/' + container.dataElement.optionSet.id + '/options.json',
params: {
- 'max': 15
+ 'max': 14
},
success: function(r) {
var options = Ext.decode(r.responseText),
@@ -1013,7 +1013,7 @@
height: 25,
items: {
xtype: 'label',
- text: NS.i18n.dimensions,
+ text: NS.i18n.filter,
cls: 'ns-toolbar-multiselect-leftright-label'
}
},
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
