完善日程事件附件

This commit is contained in:
乐风 2021-03-21 21:45:33 +08:00
parent decaabd448
commit 54bcc3b4de
2 changed files with 5 additions and 18 deletions

View File

@ -664,15 +664,12 @@ class EventController extends DefaultController
$options['accessclass'] = 'PUBLIC'; $options['accessclass'] = 'PUBLIC';
$options['access_class_options'] = CalendarService::getAccessClassOptions(); $options['access_class_options'] = CalendarService::getAccessClassOptions();
$attach['model'] = 'calendar_attachment'; $attachment['rows'] = AttachmentService::get($event['attachment']);
$attach['path'] = 'calendar';
$attach['rows'] = AttachmentService::get($event['attachment']);
$calendar = CalendarService::getCalendar($event['calendarid'], false); $calendar = CalendarService::getCalendar($event['calendarid'], false);
$share = ShareService::getItem('event', $id); $share = ShareService::getItem('event', $id);
return $this->render(array( return $this->render(array(
'attachList' => $attach, 'attachment' => $attachment,
'options' => $options, 'options' => $options,
'calendar' => $calendar, 'calendar' => $calendar,
'share' => $share, 'share' => $share,

View File

@ -57,19 +57,9 @@
<tr> <tr>
<td align="right">附件管理</td> <td align="right">附件管理</td>
@if($attachList['main'])
<td> <td>
@include('attachment/show')
@if($attachList['main'])
@foreach($attachList['main'] as $k => $v)
<div class="uploadify-queue-item">
<span class="fileName"><a href="{{url('file/attachment/file',['model'=>$attachList['model'],'id'=>$v['id']])}}">{{$v['title']}}</a></span>
<span class="fileSize">&nbsp;({{human_filesize($v['size'])}})</span>
</div><div class="clear"></div>
@endforeach
@endif
</td> </td>
@endif
</tr> </tr>
<tr> <tr>