From 787623882312d836daa11a499bc9b8efbaf44151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
<marcosgdf@gmail.com>
Date: Mon, 2 Mar 2015 01:36:27 +0100
Subject: [PATCH] Fixed bug with hide/show checkboxes reported by Ruben Almeida
(aruben) When an external calendar was called "mytasks", Dolibarr events were
also hidden too.
---
htdocs/comm/action/index.php | 2 +-
htdocs/core/lib/agenda.lib.php | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 38e8ab24bb1..82e6818a250 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1038,7 +1038,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
$numicals[dol_string_nospecial($event->icalname)]++;
}
$color=$event->icalcolor;
- $cssclass=(! empty($event->icalname)?'family_'.dol_string_nospecial($event->icalname):'family_other');
+ $cssclass=(! empty($event->icalname)?'family_ext'.dol_string_nospecial($event->icalname):'family_other');
}
else if ($event->type_code == 'BIRTHDAY') { $numbirthday++; $colorindex=2; $cssclass='family_birthday'; }
else { $numother++; $cssclass='family_other'; }
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 5bd0bc5ee95..219b69015a0 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -130,7 +130,6 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
print '<td align="center" valign="middle" class="nowrap">';
print '<script type="text/javascript">' . "\n";
print 'jQuery(document).ready(function () {' . "\n";
- print 'jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });' . "\n";
print 'jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n";
print 'jQuery(".family_birthday").toggle();' . "\n";
print '});' . "\n";
@@ -162,7 +161,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
$htmlname = dol_string_nospecial($val['name']);
print '<tr><td>';
- print '<input type="checkbox" id="check_' . $htmlname . '" name="check_' . $htmlname . '" checked="true"> ' . $val ['name'];
+ print '<input type="checkbox" id="check_' . $htmlname . '" name="check_ext' . $htmlname . '" checked="true"> ' . $val ['name'];
print '</td></tr>';
}
}
--
GitLab