plugins/calendar

Aleksander Machniak machniak at kolabsys.com
Mon Aug 25 10:30:43 CEST 2014


 plugins/calendar/calendar_ui.js |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 50f724a5d30776d19379e57c9f3340f80f653dce
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Mon Aug 25 04:29:43 2014 -0400

    Search also in resource description on resources list (#3380)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 1b3547d..a9c47e6 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -2279,14 +2279,17 @@ function rcube_calendar_ui(settings)
     // quick-filter the loaded resource data
     var resource_search = function()
     {
-      var dataset, rec, q = $('#resourcesearchbox').val().toLowerCase();
-      if (q.length && resources_data) {
-        dataset = [];
+      var dn, rec, dataset = [],
+        q = $('#resourcesearchbox').val().toLowerCase();
 
+      if (q.length && resources_data) {
         // search by iterating over all resource records
-        for (var dn in resources_data) {
+        for (dn in resources_data) {
           rec = resources_data[dn];
-          if (String(rec.name).toLowerCase().indexOf(q) >= 0 || String(rec.email).toLowerCase() == q) {
+          if ((rec.name && String(rec.name).toLowerCase().indexOf(q) >= 0)
+            || (rec.email && String(rec.email).toLowerCase().indexOf(q) >= 0)
+            || (rec.description && String(rec.description).toLowerCase().indexOf(q) >= 0)
+          ) {
             dataset.push(rec.ID);
           }
         }




More information about the commits mailing list