Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix attachment saving and displaying

Browse source
This commit is contained in:
Thomas Bruederli 2014-07-31 14:53:56 +02:00
parent 65989e7783
commit 887ec67df8
7 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -606,7 +606,7 @@ class kolab_calendar extends kolab_storage_folder_api
foreach ($event['attachments'] as $attachment) {
$key = null;
// Roundcube ID has nothing to do with the storage ID, remove it
if ($attachment['content']) {
if ($attachment['content'] || $attachment['path']) {
unset($attachment['id']);
}
else {

9
plugins/calendar/skins/larry/calendar.css
View file

@ -34,12 +34,8 @@ body.calendarmain #mainscreen {
}
}
body.attachmentwin #mainscreen {
top: 60px;
}
body.attachmentwin #topnav .topright {
margin-top: 20px;
body.calendar.attachmentwin #mainscreen {
top: 32px;
}
#calendarsidebar {
@ -549,6 +545,7 @@ a.miniColors-trigger {
text-shadow: 0px 1px 1px #fff;
text-decoration: none;
white-space: nowrap;
line-height: 20px;
}
#edit-attachments ul li a.file {

3
plugins/calendar/skins/larry/templates/attachment.html
View file

@ -4,11 +4,10 @@
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
</head>
<body class="extwin attachmentwin">
<body class="extwin calendar attachmentwin">
<div id="header">
<div id="topnav">
<roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" />
<div class="topright">
<a href="#close" class="closelink" onclick="self.close()"><roundcube:label name="close" /></a>
</div>

2
plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
View file

@ -879,7 +879,7 @@ class tasklist_kolab_driver extends tasklist_driver
foreach ($task['attachments'] as $idx => $attachment) {
$key = null;
// Roundcube ID has nothing to do with the storage ID, remove it
if ($attachment['content']) {
if ($attachment['content'] || $attachment['path']) {
unset($attachment['id']);
}
else {

8
plugins/tasklist/skins/larry/tasklist.css
View file

@ -30,12 +30,8 @@ div.uidialog {
display: none;
}
body.attachmentwin #mainscreen {
top: 60px;
}
body.attachmentwin #topnav .topright {
margin-top: 20px;
body.tasklist.attachmentwin #mainscreen {
top: 32px;
}
.tasklistview #mainscreen {

3
plugins/tasklist/skins/larry/templates/attachment.html
View file

@ -4,11 +4,10 @@
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
</head>
<body class="extwin attachmentwin">
<body class="extwin tasklist attachmentwin">
<div id="header">
<div id="topnav">
<roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" />
<div class="topright">
<a href="#close" class="closelink" onclick="self.close()"><roundcube:label name="close" /></a>
</div>

2
plugins/tasklist/tasklist.php
View file

@ -342,7 +342,7 @@ class tasklist extends rcube_plugin
$this->rc->output->show_message('tasklist.errornotifying', 'error');
}
}
else if ($success && $rec['_reportpartstat']) {
else if ($success && $rec['_reportpartstat'] && $rec['_reportpartstat'] != 'NEEDS-ACTION') {
// get the full record after update
$task = $this->driver->get_task($rec);