dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 13918 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-02-03 15:02:20 +0100
message:
  GIS, action removed, cleanup.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.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-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2014-01-31 16:31:07 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2014-02-03 12:57:11 +0000
@@ -507,30 +507,6 @@
 				data: gis.conf.period.periodTypes
 			});
 
-			store.infrastructuralPeriodsByType = Ext.create('Ext.data.Store', {
-				fields: ['id', 'name'],
-				proxy: {
-					type: 'ajax',
-					url: gis.init.contextPath + gis.conf.finals.url.path_module + 'getPeriodsByPeriodType.action',
-					reader: {
-						type: 'json',
-						root: 'periods'
-					},
-					extraParams: {
-						name: gis.init.systemSettings.infrastructuralPeriodType
-					}
-				},
-				autoLoad: false,
-				isLoaded: false,
-				listeners: {
-					load: function() {
-						if (!this.isLoaded) {
-							this.isLoaded = true;
-						}
-					}
-				}
-			});
-
 			store.groupSets = Ext.create('Ext.data.Store', {
 				fields: ['id', 'name'],
 				proxy: {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js	2014-01-31 16:31:07 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js	2014-02-03 12:57:11 +0000
@@ -364,11 +364,11 @@
 											labelWidth: 70,
 											store: {
 												fields: ['id', 'name'],
-												data: function() {													
+												data: function() {
 													var pt = new PeriodType(),
 														periodType = gis.init.systemSettings.infrastructuralPeriodType.id,
 														data;
-														
+
 													data = pt.get(periodType).generatePeriods({
 														offset: 0,
 														filterFuturePeriods: true,
@@ -381,7 +381,7 @@
 
 													return data;
 												}()
-											},												
+											},
 											lockPosition: false,
 											listeners: {
 												select: function(cmp) {
@@ -529,7 +529,7 @@
 					}
 				}));
 			}
-			
+
 			if (isRelocate && isPoint) {
 
                 if (layer.id !== 'facility') {
@@ -594,21 +594,9 @@
 					text: GIS.i18n.show_information_sheet,
 					iconCls: 'gis-menu-item-icon-information',
 					handler: function(item) {
-						if (gis.store.infrastructuralPeriodsByType.isLoaded) {
-							showInfo();
-						}
-						else {
-							gis.store.infrastructuralPeriodsByType.load({
-								params: {
-									name: gis.init.systemSettings.infrastructuralPeriodType
-								},
-								callback: function() {
-									showInfo();
-								}
-							});
-						}
-					}
-				}));
+                        showInfo();
+                    }
+                }));
 			}
 
 			menuItems[menuItems.length - 1].addCls('gis-menu-item-last');