[icinga-checkins] icinga.org: icinga-web/jmosshammer/default: * REPORTING: Fixed merge structure

git at icinga.org git at icinga.org
Fri Aug 5 09:13:15 CEST 2011


Module: icinga-web
Branch: jmosshammer/default
Commit: 3960125883ba4c04c31a60b383c95edf9741b254
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=3960125883ba4c04c31a60b383c95edf9741b254

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Aug  1 13:19:15 2011 +0200

* REPORTING: Fixed merge structure

---

 .../Reporting/lib/js/Icinga.Reporting.Cronk.js     |   23 +-------------------
 1 files changed, 1 insertions(+), 22 deletions(-)

diff --git a/app/modules/Reporting/lib/js/Icinga.Reporting.Cronk.js b/app/modules/Reporting/lib/js/Icinga.Reporting.Cronk.js
index 9b5231a..1577373 100644
--- a/app/modules/Reporting/lib/js/Icinga.Reporting.Cronk.js
+++ b/app/modules/Reporting/lib/js/Icinga.Reporting.Cronk.js
@@ -56,7 +56,6 @@ Icinga.Reporting.Cronk = Ext.extend(Ext.TabPanel, {
 		/**
 		 * @Todo: Implement this (80%)
 		 */
-<<<<<<< HEAD
 //		if (this.enable_scheduling == true) {
 //			
 //			this.enableScheduling = new Icinga.Reporting.util.ReportScheduling({
@@ -75,25 +74,5 @@ Icinga.Reporting.Cronk = Ext.extend(Ext.TabPanel, {
 //				iconCls : 'icinga-icon-alarm-clock'
 //			});
 //		}
-=======
-		if (this.enable_scheduling == true) {
-			
-			this.enableScheduling = new Icinga.Reporting.util.ReportScheduling({
-				treeloader_url : this.treeloader_url,
-				scheduler_list_url : this.scheduler_list_url,
-				scheduler_get_url : this.scheduler_get_url,
-				scheduler_edit_url : this.scheduler_edit_url,
-				scheduler_delete_url : this.scheduler_delete_url,
-				parentCmp : this
-			});
-			
-			this.add({
-				title: _('Scheduling'),
-				tabTip: _('Report scheduling'),
-				items : this.enableScheduling,
-				iconCls : 'icinga-icon-alarm-clock'
-			});
-		}
->>>>>>> ee10e9c5308838ade042d7cbcf72926a649b8ed6
 	}
-});
\ No newline at end of file
+});





More information about the icinga-checkins mailing list