harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disable file notifications on initial upload for now - it can behave funky when uploading multiple small files at once

Browse Source
This commit is contained in:
git-marijus 2017-07-31 02:35:46 +02:00
parent b4efe8ad8d
commit 988371be0b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/attach.php
View File

@ -888,9 +888,9 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
} }
if($notify) { if($notify) {
$cloudPath = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['0']['display_path']; //$cloudPath = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['0']['display_path'];
$object = get_file_activity_object($channel['channel_id'], $r['0']['hash'], $cloudPath); //$object = get_file_activity_object($channel['channel_id'], $r['0']['hash'], $cloudPath);
file_activity($channel['channel_id'], $object, $r['0']['allow_cid'], $r['0']['allow_gid'], $r['0']['deny_cid'], $r['0']['deny_gid'], 'post', $notify); //file_activity($channel['channel_id'], $object, $r['0']['allow_cid'], $r['0']['allow_gid'], $r['0']['deny_cid'], $r['0']['deny_gid'], 'post', $notify);
} }
return $ret; return $ret;

2
view/tpl/cloud_actionspanel.tpl
View File

@ -26,7 +26,7 @@
<input type="hidden" name="return_url" value="{{$return_url}}" /> <input type="hidden" name="return_url" value="{{$return_url}}" />
<label for="files-upload">{{$upload_header}}</label> <label for="files-upload">{{$upload_header}}</label>
<input class="form-group pull-left" id="files-upload" type="file" name="userfile"> <input class="form-group pull-left" id="files-upload" type="file" name="userfile">
{{include file="field_checkbox.tpl" field=$notify}} {{**include file="field_checkbox.tpl" field=$notify**}}
<div class="pull-right btn-group"> <div class="pull-right btn-group">
<div class="btn-group"> <div class="btn-group">
{{if $lockstate}} {{if $lockstate}}