Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
b14a1b2a
Commit
b14a1b2a
authored
Aug 21, 2014
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge pull request #1832 from KreizIT/Calendar
Fix allday event move
parents
137efaa1
8d13ab0d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/comm/action/index.php
+9
-12
9 additions, 12 deletions
htdocs/comm/action/index.php
with
9 additions
and
12 deletions
htdocs/comm/action/index.php
+
9
−
12
View file @
b14a1b2a
...
@@ -1192,14 +1192,12 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
...
@@ -1192,14 +1192,12 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
$cssclass
=
$cssclass
.
' '
.
$cssclass
.
'_day_'
.
$ymd
;
$cssclass
=
$cssclass
.
' '
.
$cssclass
.
'_day_'
.
$ymd
;
// Defined style to disable drag and drop feature
// Defined style to disable drag and drop feature
if
(
empty
(
$event
->
fulldayevent
))
if
(
$event
->
date_end_in_calendar
&&
date
(
'Ymd'
,
$event
->
date_start_in_calendar
)
!=
date
(
'Ymd'
,
$event
->
date_end_in_calendar
))
{
if
(
$event
->
date_end_in_calendar
&&
$event
->
date_start_in_calendar
!=
$event
->
date_end_in_calendar
)
{
{
$tmpyearend
=
date
(
'Y'
,
$event
->
date_end_in_calendar
);
$tmpyearend
=
date
(
'Y'
,
$event
->
date_end_in_calendar
);
$tmpmonthend
=
date
(
'm'
,
$event
->
date_end_in_calendar
);
$tmpmonthend
=
date
(
'm'
,
$event
->
date_end_in_calendar
);
$tmpdayend
=
date
(
'd'
,
$event
->
date_end_in_calendar
);
$tmpdayend
=
date
(
'd'
,
$event
->
date_end_in_calendar
);
if
(
$tmpyearend
!
=
$annee
||
$tmpmonthend
!
=
$mois
||
$tmpdayend
!
=
$jour
)
if
(
$tmpyearend
=
=
$annee
&&
$tmpmonthend
=
=
$mois
&&
$tmpdayend
=
=
$jour
)
{
{
$cssclass
.
=
" unsortable"
;
$cssclass
.
=
" unsortable"
;
}
}
...
@@ -1208,7 +1206,6 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
...
@@ -1208,7 +1206,6 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
{
{
$cssclass
.
=
" unsortable"
;
$cssclass
.
=
" unsortable"
;
}
}
}
// Show rect of event
// Show rect of event
print
'<div id="event_'
.
$ymd
.
'_'
.
$i
.
'" class="event '
.
$cssclass
.
'">'
;
print
'<div id="event_'
.
$ymd
.
'_'
.
$i
.
'" class="event '
.
$cssclass
.
'">'
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment