dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33891
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17360: PT DV GIS ER EV fav owner visible in sharing window.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 17360 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-11-05 15:54:21 +0100
message:
PT DV GIS ER EV fav owner visible in sharing window.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/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-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties 2014-10-22 16:41:32 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties 2014-11-05 14:51:47 +0000
@@ -172,3 +172,4 @@
last_52_weeks=Last 52 weeks
last_6_months=Last 6 months
initializing=Initializing
+created_by=Created by
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-11-03 15:19:13 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-11-05 14:51:47 +0000
@@ -2811,6 +2811,7 @@
var items = [];
combo = Ext.create('Ext.form.field.ComboBox', {
+ style: 'margin-bottom:2px',
fieldLabel: isPublicAccess ? NS.i18n.public_access : obj.name,
labelStyle: 'color:#333',
cls: 'ns-combo',
@@ -2980,7 +2981,7 @@
window = Ext.create('Ext.window.Window', {
title: NS.i18n.sharing_settings,
- bodyStyle: 'padding:6px 6px 0px; background-color:#fff',
+ bodyStyle: 'padding:5px 5px 3px; background-color:#fff',
resizable: false,
modal: true,
destroyOnBlur: true,
@@ -2988,7 +2989,7 @@
{
html: sharing.object.name,
bodyStyle: 'border:0 none; font-weight:bold; color:#333',
- style: 'margin-bottom:8px'
+ style: 'margin-bottom:7px'
},
{
xtype: 'container',
@@ -2999,6 +3000,11 @@
userGroupButton
]
},
+ {
+ html: NS.i18n.created_by + ' ' + sharing.object.user.name,
+ bodyStyle: 'border:0 none; color:#777',
+ style: 'margin-top:2px;margin-bottom:7px'
+ },
userGroupRowContainer
],
bbar: [
@@ -3007,7 +3013,7 @@
text: NS.i18n.save,
handler: function() {
Ext.Ajax.request({
- url: ns.core.init.contextPath + '/api/sharing?type=eventReport&id=' + sharing.object.id,
+ url: ns.core.init.contextPath + '/api/sharing?type=reportTable&id=' + sharing.object.id,
method: 'POST',
headers: {
'Content-Type': 'application/json'
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties 2014-10-22 16:41:32 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties 2014-11-05 14:51:47 +0000
@@ -196,3 +196,4 @@
last_52_weeks=Last 52 weeks
last_6_months=Last 6 months
initializing=Initializing
+created_by=Created by
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-10-30 16:12:52 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-11-05 14:51:47 +0000
@@ -2451,6 +2451,7 @@
var items = [];
combo = Ext.create('Ext.form.field.ComboBox', {
+ style: 'margin-bottom:2px',
fieldLabel: isPublicAccess ? NS.i18n.public_access : obj.name,
labelStyle: 'color:#333',
cls: 'ns-combo',
@@ -2620,7 +2621,7 @@
window = Ext.create('Ext.window.Window', {
title: NS.i18n.sharing_settings,
- bodyStyle: 'padding:6px 6px 0px; background-color:#fff',
+ bodyStyle: 'padding:5px 5px 3px; background-color:#fff',
resizable: false,
modal: true,
destroyOnBlur: true,
@@ -2628,7 +2629,7 @@
{
html: sharing.object.name,
bodyStyle: 'border:0 none; font-weight:bold; color:#333',
- style: 'margin-bottom:8px'
+ style: 'margin-bottom:7px'
},
{
xtype: 'container',
@@ -2639,6 +2640,11 @@
userGroupButton
]
},
+ {
+ html: NS.i18n.created_by + ' ' + sharing.object.user.name,
+ bodyStyle: 'border:0 none; color:#777',
+ style: 'margin-top:2px;margin-bottom:7px'
+ },
userGroupRowContainer
],
bbar: [
@@ -2647,7 +2653,7 @@
text: NS.i18n.save,
handler: function() {
Ext.Ajax.request({
- url: ns.core.init.contextPath + '/api/sharing?type=eventChart&id=' + sharing.object.id,
+ url: ns.core.init.contextPath + '/api/sharing?type=reportTable&id=' + sharing.object.id,
method: 'POST',
headers: {
'Content-Type': 'application/json'
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/en.properties 2014-10-23 09:11:36 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/en.properties 2014-11-05 14:51:47 +0000
@@ -414,3 +414,5 @@
select_sub_units=Select sub-units
you_do_not_have_access_to_all_items_in_this_favorite=You do not have access to all items in this favorite
initializing=Initializing
+created_by=Created by
+created_by=Created by
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-10-29 00:52:49 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-11-05 14:51:47 +0000
@@ -2318,6 +2318,7 @@
var items = [];
combo = Ext.create('Ext.form.field.ComboBox', {
+ style: 'margin-bottom:2px',
fieldLabel: isPublicAccess ? GIS.i18n.public_access : obj.name,
labelStyle: 'color:#333',
cls: 'gis-combo',
@@ -2482,7 +2483,7 @@
window = Ext.create('Ext.window.Window', {
title: 'Sharing settings',
- bodyStyle: 'padding:6px 6px 0; background-color:#fff',
+ bodyStyle: 'padding:5px 5px 3px; background-color:#fff',
resizable: false,
modal: true,
destroyOnBlur: true,
@@ -2490,7 +2491,7 @@
{
html: sharing.object.name,
bodyStyle: 'border:0 none; font-weight:bold; color:#333',
- style: 'margin-bottom:8px'
+ style: 'margin-bottom:7px'
},
{
xtype: 'container',
@@ -2501,6 +2502,11 @@
userGroupButton
]
},
+ {
+ html: GIS.i18n.created_by + ' ' + sharing.object.user.name,
+ bodyStyle: 'border:0 none; color:#777',
+ style: 'margin-top:2px;margin-bottom:7px'
+ },
userGroupRowContainer
],
bbar: [
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/en.properties 2014-10-14 09:05:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/en.properties 2014-11-05 14:51:47 +0000
@@ -171,3 +171,4 @@
show_row_subtotals=Show row sub-totals
last_52_weeks=Last 52 weeks
last_6_months=Last 6 months
+created_by=Created by
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-10-14 15:40:58 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-11-05 14:51:47 +0000
@@ -1552,6 +1552,7 @@
var items = [];
combo = Ext.create('Ext.form.field.ComboBox', {
+ style: 'margin-bottom:2px',
fieldLabel: isPublicAccess ? NS.i18n.public_access : obj.name,
labelStyle: 'color:#333',
cls: 'ns-combo',
@@ -1721,7 +1722,7 @@
window = Ext.create('Ext.window.Window', {
title: NS.i18n.sharing_settings,
- bodyStyle: 'padding:6px 6px 0px; background-color:#fff',
+ bodyStyle: 'padding:5px 5px 3px; background-color:#fff',
resizable: false,
modal: true,
destroyOnBlur: true,
@@ -1729,7 +1730,7 @@
{
html: sharing.object.name,
bodyStyle: 'border:0 none; font-weight:bold; color:#333',
- style: 'margin-bottom:8px'
+ style: 'margin-bottom:7px'
},
{
xtype: 'container',
@@ -1740,6 +1741,11 @@
userGroupButton
]
},
+ {
+ html: NS.i18n.created_by + ' ' + sharing.object.user.name,
+ bodyStyle: 'border:0 none; color:#777',
+ style: 'margin-top:2px;margin-bottom:7px'
+ },
userGroupRowContainer
],
bbar: [
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties 2014-10-14 09:37:49 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties 2014-11-05 14:51:47 +0000
@@ -244,3 +244,4 @@
sort_order=Sort order
last_52_weeks=Last 52 weeks
last_6_months=Last 6 months
+created_by=Created by
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-10-21 16:30:56 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-11-05 14:51:47 +0000
@@ -1597,6 +1597,7 @@
var items = [];
combo = Ext.create('Ext.form.field.ComboBox', {
+ style: 'margin-bottom:2px',
fieldLabel: isPublicAccess ? NS.i18n.public_access : obj.name,
labelStyle: 'color:#333',
cls: 'ns-combo',
@@ -1654,6 +1655,11 @@
};
getBody = function() {
+ if (!ns.core.init.user) {
+ alert('User is not assigned to any organisation units');
+ return;
+ }
+
var body = {
object: {
id: sharing.object.id,
@@ -1761,7 +1767,7 @@
window = Ext.create('Ext.window.Window', {
title: NS.i18n.sharing_settings,
- bodyStyle: 'padding:6px 6px 0px; background-color:#fff',
+ bodyStyle: 'padding:5px 5px 3px; background-color:#fff',
resizable: false,
modal: true,
destroyOnBlur: true,
@@ -1769,7 +1775,7 @@
{
html: sharing.object.name,
bodyStyle: 'border:0 none; font-weight:bold; color:#333',
- style: 'margin-bottom:8px'
+ style: 'margin-bottom:7px'
},
{
xtype: 'container',
@@ -1780,6 +1786,11 @@
userGroupButton
]
},
+ {
+ html: NS.i18n.created_by + ' ' + sharing.object.user.name,
+ bodyStyle: 'border:0 none; color:#777',
+ style: 'margin-top:2px;margin-bottom:7px'
+ },
userGroupRowContainer
],
bbar: [
@@ -1788,7 +1799,7 @@
text: NS.i18n.save,
handler: function() {
Ext.Ajax.request({
- url: ns.core.init.contextPath + '/api/sharing?type=chart&id=' + sharing.object.id,
+ url: ns.core.init.contextPath + '/api/sharing?type=reportTable&id=' + sharing.object.id,
method: 'POST',
headers: {
'Content-Type': 'application/json'
