cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [19/50] [abbrv] git commit: updated refs/heads/disk-cache to 99d67cb
Date Mon, 02 Sep 2013 20:05:05 GMT
CLOUDSTACK-4010: Events/alerts: Pass start date / end date

Original submitter: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/977b0eca
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/977b0eca
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/977b0eca

Branch: refs/heads/disk-cache
Commit: 977b0eca973b721fe158768f3f3c5515b9d2aab7
Parents: 51cacad
Author: Brian Federle <brian.federle@citrix.com>
Authored: Fri Aug 2 09:51:55 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Fri Aug 2 09:52:22 2013 -0700

----------------------------------------------------------------------
 ui/scripts/events.js | 93 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 67 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/977b0eca/ui/scripts/events.js
----------------------------------------------------------------------
diff --git a/ui/scripts/events.js b/ui/scripts/events.js
index 873998e..d2e9aa4 100644
--- a/ui/scripts/events.js
+++ b/ui/scripts/events.js
@@ -75,8 +75,13 @@
                                         label: 'By event type',
                                         docID: 'helpEventsDeleteType'
                                     },
-                                    date: {
-                                        label: 'By date (older than)',
+                                    startdate: {
+                                        label: 'By date (start date)',
+                                        docID: 'helpEventsDeleteDate',
+                                        isDatepicker: true
+                                    },
+                                    enddate: {
+                                        label: 'By date (end date)',
                                         docID: 'helpEventsDeleteDate',
                                         isDatepicker: true
                                     }
@@ -91,9 +96,14 @@
                                         type: args.data.type
                                     });
 
-                                if (args.data.date != "")
+                                if (args.data.startdate != "")
                                     $.extend(data, {
-                                        olderthan: args.data.date
+                                        startdate: args.data.startdate
+                                    });
+
+                                if (args.data.enddate != "")
+                                    $.extend(data, {
+                                        enddate: args.data.enddate
                                     });
 
                                 $.ajax({
@@ -132,11 +142,16 @@
                                         label: 'By event type',
                                         docID: 'helpEventsArchiveType'
                                     },
-                                    date: {
-                                        label: 'By date (older than)',
+                                    startdate: {
+                                        label: 'By date (start date)',
                                         docID: 'helpEventsArchiveDate',
                                         isDatepicker: true
                                     },
+                                    enddate: {
+                                        label: 'By date (end date)',
+                                        docID: 'helpEventsArchiveDate',
+                                        isDatepicker: true
+                                    }
                                 }
                             },
                             action: function(args) {
@@ -147,9 +162,14 @@
                                         type: args.data.type
                                     });
 
-                                if (args.data.date != "")
+                                if (args.data.startdate != "")
                                     $.extend(data, {
-                                        olderthan: args.data.date
+                                        startdate: args.data.startdate
+                                    });
+
+                                if (args.data.enddate != "")
+                                    $.extend(data, {
+                                        enddate: args.data.enddate
                                     });
 
                                 $.ajax({
@@ -250,16 +270,16 @@
                             }
                         }
                         /*
-						,
-            startdate: {
-              label: 'Start Date',
-							isDatepicker: true
-            },
-            enddate: {
-              label: 'End Date',
-							isDatepicker: true
-            }
-            */
+						             ,
+                         startdate: {
+                         label: 'Start Date',
+							           isDatepicker: true
+                         },
+                         enddate: {
+                         label: 'End Date',
+							           isDatepicker: true
+                         }
+                         */
                     },
 
                     dataProvider: function(args) {
@@ -424,8 +444,13 @@
                                         label: 'By Alert type',
                                         docID: 'helpAlertsDeleteType'
                                     },
-                                    date: {
-                                        label: 'By date (older than)',
+                                    startdate: {
+                                        label: 'By date (start date)',
+                                        docID: 'helpAlertsDeleteDate',
+                                        isDatepicker: true
+                                    },
+                                    enddate: {
+                                        label: 'By date (end than)',
                                         docID: 'helpAlertsDeleteDate',
                                         isDatepicker: true
                                     }
@@ -440,9 +465,14 @@
                                         type: args.data.type
                                     });
 
-                                if (args.data.date != "")
+                                if (args.data.startdate != "")
                                     $.extend(data, {
-                                        olderthan: args.data.date
+                                        startdate: args.data.startdate
+                                    });
+
+                                if (args.data.enddate != "")
+                                    $.extend(data, {
+                                        enddate: args.data.enddate
                                     });
 
                                 $.ajax({
@@ -481,11 +511,17 @@
                                         label: 'By Alert type',
                                         docID: 'helpAlertsArchiveType'
                                     },
-                                    date: {
-                                        label: 'By date (older than)',
+                                    startdate: {
+                                        label: 'By date (start date)',
+                                        docID: 'helpAlertsArchiveDate',
+                                        isDatepicker: true
+                                    },
+                                    enddate: {
+                                        label: 'By date (end date)',
                                         docID: 'helpAlertsArchiveDate',
                                         isDatepicker: true
                                     }
+
                                 }
                             },
                             action: function(args) {
@@ -496,9 +532,14 @@
                                         type: args.data.type
                                     });
 
-                                if (args.data.date != "")
+                                if (args.data.startdate != "")
+                                    $.extend(data, {
+                                        startdate: args.data.startdate
+                                    });
+
+                                if (args.data.enddate != "")
                                     $.extend(data, {
-                                        olderthan: args.data.date
+                                        enddate: args.data.enddate
                                     });
 
                                 $.ajax({


Mime
View raw message