dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #42180
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21545: Analysis, merge strategy.
------------------------------------------------------------
revno: 21545
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-12-29 17:02:17 +0100
message:
Analysis, merge strategy.
modified:
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/scripts/app.js
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/scripts/app.js
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/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-12-04 14:38:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-12-29 16:02:17 +0000
@@ -3106,7 +3106,7 @@
eventReport.name = name;
Ext.Ajax.request({
- url: ns.core.init.contextPath + '/api/eventReports/' + eventReport.id,
+ url: ns.core.init.contextPath + '/api/eventReports/' + eventReport.id + '?mergeStrategy=REPLACE',
method: 'PUT',
headers: {'Content-Type': 'application/json'},
params: Ext.encode(eventReport),
@@ -3309,7 +3309,7 @@
if (confirm(message)) {
Ext.Ajax.request({
- url: ns.core.init.contextPath + '/api/eventReports/' + record.data.id,
+ url: ns.core.init.contextPath + '/api/eventReports/' + record.data.id + '?mergeStrategy=REPLACE',
method: 'PUT',
headers: {'Content-Type': 'application/json'},
params: Ext.encode(favorite),
=== 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 2015-12-04 14:38:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2015-12-29 16:02:17 +0000
@@ -2791,7 +2791,7 @@
eventChart.name = name;
Ext.Ajax.request({
- url: ns.core.init.contextPath + '/api/eventCharts/' + eventChart.id,
+ url: ns.core.init.contextPath + '/api/eventCharts/' + eventChart.id + '?mergeStrategy=REPLACE',
method: 'PUT',
headers: {'Content-Type': 'application/json'},
params: Ext.encode(eventChart),
@@ -2994,7 +2994,7 @@
if (confirm(message)) {
Ext.Ajax.request({
- url: ns.core.init.contextPath + '/api/eventCharts/' + record.data.id,
+ url: ns.core.init.contextPath + '/api/eventCharts/' + record.data.id + '?mergeStrategy=REPLACE',
method: 'PUT',
headers: {'Content-Type': 'application/json'},
params: Ext.encode(favorite),
=== 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 2015-12-03 11:08:09 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2015-12-29 16:02:17 +0000
@@ -2768,7 +2768,7 @@
map.name = name;
Ext.Ajax.request({
- url: gis.init.contextPath + '/api/maps/' + id,
+ url: gis.init.contextPath + '/api/maps/' + id + '?mergeStrategy=REPLACE',
method: 'PUT',
headers: {'Content-Type': 'application/json'},
params: Ext.encode(map),
@@ -2984,7 +2984,7 @@
};
Ext.Ajax.request({
- url: gis.init.contextPath + '/api/maps/' + record.data.id,
+ url: gis.init.contextPath + '/api/maps/' + record.data.id + '?mergeStrategy=REPLACE',
method: 'PUT',
headers: {'Content-Type': 'application/json'},
params: Ext.encode(map),
@@ -3991,7 +3991,7 @@
body = Ext.encode(getRequestBody());
Ext.Ajax.request({
- url: gis.init.contextPath + '/api/legendSets/' + id,
+ url: gis.init.contextPath + '/api/legendSets/' + id + '?mergeStrategy=REPLACE',
method: 'PUT',
headers: {'Content-Type': 'application/json'},
params: body,
=== 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 2015-12-04 12:10:23 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-12-29 16:02:17 +0000
@@ -1200,7 +1200,7 @@
reportTable.name = name;
Ext.Ajax.request({
- url: ns.core.init.contextPath + '/api/reportTables/' + reportTable.id,
+ url: ns.core.init.contextPath + '/api/reportTables/' + reportTable.id + '?mergeStrategy=REPLACE',
method: 'PUT',
headers: {'Content-Type': 'application/json'},
params: Ext.encode(reportTable),
@@ -1400,7 +1400,7 @@
if (confirm(message)) {
Ext.Ajax.request({
- url: ns.core.init.contextPath + '/api/reportTables/' + record.data.id,
+ url: ns.core.init.contextPath + '/api/reportTables/' + record.data.id + '?mergeStrategy=REPLACE',
method: 'PUT',
headers: {'Content-Type': 'application/json'},
params: Ext.encode(favorite),
@@ -7243,6 +7243,7 @@
}
},
tbar: {
+ style: 'border-top: 0 none',
defaults: {
height: 26
},
=== 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 2015-12-04 12:10:23 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-12-29 16:02:17 +0000
@@ -1301,7 +1301,7 @@
chart.name = name;
Ext.Ajax.request({
- url: ns.core.init.contextPath + '/api/charts/' + chart.id,
+ url: ns.core.init.contextPath + '/api/charts/' + chart.id + '?mergeStrategy=REPLACE',
method: 'PUT',
headers: {'Content-Type': 'application/json'},
params: Ext.encode(chart),
@@ -1501,7 +1501,7 @@
if (confirm(message)) {
Ext.Ajax.request({
- url: ns.core.init.contextPath + '/api/charts/' + record.data.id,
+ url: ns.core.init.contextPath + '/api/charts/' + record.data.id + '?mergeStrategy=REPLACE',
method: 'PUT',
headers: {'Content-Type': 'application/json'},
params: Ext.encode(favorite),
