From 01af72cfe95e1970fa84405732690355ed72dcd8 Mon Sep 17 00:00:00 2001 From: Alexandre Cloutier Date: Tue, 15 Jul 2014 09:49:48 -0400 Subject: [PATCH] DnD from eventList to the calendarList --- UI/WebServerResources/SchedulerUI.css | 11 +++++++++++ UI/WebServerResources/SchedulerUI.js | 16 ++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index 57d9bf9f5..20df19878 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -1536,6 +1536,17 @@ DIV#calendarContent .alert-box span { border:1px solid #8ed9f6; } +DIV#dragDropVisual +{ + background-image: url(event7.png); + background-repeat: no-repeat; + background-position: 4px 2px; + width: 5px; + height: 20px; + padding-left: 24px; + padding-top: 5px; +} + diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 35700a9dd..b3553e0ec 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -3163,20 +3163,20 @@ function dropSelectedEvents(action, toId) { var eventIds = $('eventsList').getSelectedRowsId(); for (var i = 0; i < eventIds.length; i++) { if (!eventIds[i].endsWith("ics")) { - showAlertDialog(_("Invalid, it is just invalid.. don't try this again please")); + showAlertDialog(_("An error as occurred please try again")); return false; } else { - if (eventIds.grep(toId+"-").length == 0) { + if (eventIds[i].search(toId+"-") == -1) { - var x = eventIds[0].indexOf('-'); - if (eventIds[0].indexOf('-') == 4) { - fromId = eventIds[0].substr(0,25); - eventICS = eventIds[0].substr(26); + var x = eventIds[i].indexOf('-'); + if (eventIds[i].indexOf('-') == 4) { + fromId = eventIds[i].substr(0,25); + eventICS = eventIds[i].substr(26); } else { - fromId = eventIds[0].substr(0, x); - eventICS = eventIds[0].slice(x + 1); + fromId = eventIds[i].substr(0, x); + eventICS = eventIds[i].slice(x + 1); } var calendarID = "calendarID=" + fromId + "," + toId;