Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 22:14:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove fallback support for dropzone

Browse Source
This commit is contained in:
Hillel Coren 2016-05-30 11:51:41 +03:00
parent 162c6d2ce6
commit 2f3c309d41
8 changed files with 87 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Ninja/Repositories/ExpenseRepository.php
View File

@ -159,25 +159,6 @@ class ExpenseRepository extends BaseRepository
} }
} }
if(!empty($input['documents']) && Auth::user()->can('create', ENTITY_DOCUMENT)){
// Fallback upload
$doc_errors = array();
foreach($input['documents'] as $upload){
$result = $this->documentRepo->upload($upload);
if(is_string($result)){
$doc_errors[] = $result;
}
else{
$result->expense_id = $expense->id;
$result->save();
$document_ids[] = $result->public_id;
}
}
if(!empty($doc_errors)){
Session::flash('error', implode('<br>',array_map('htmlentities',$doc_errors)));
}
}
// prevent loading all of the documents if we don't have to // prevent loading all of the documents if we don't have to
if ( ! $expense->wasRecentlyCreated) { if ( ! $expense->wasRecentlyCreated) {
foreach ($expense->documents as $document){ foreach ($expense->documents as $document){

19
app/Ninja/Repositories/InvoiceRepository.php
View File

@ -494,25 +494,6 @@ class InvoiceRepository extends BaseRepository
} }
} }
if(!empty($data['documents']) && Auth::user()->can('create', ENTITY_DOCUMENT)){
// Fallback upload
$doc_errors = array();
foreach($data['documents'] as $upload){
$result = $this->documentRepo->upload($upload);
if(is_string($result)){
$doc_errors[] = $result;
}
else{
$result->invoice_id = $invoice->id;
$result->save();
$document_ids[] = $result->public_id;
}
}
if(!empty($doc_errors)){
Session::flash('error', implode('<br>',array_map('htmlentities',$doc_errors)));
}
}
foreach ($invoice->documents as $document){ foreach ($invoice->documents as $document){
if(!in_array($document->public_id, $document_ids)){ if(!in_array($document->public_id, $document_ids)){
// Removed // Removed

9
public/built.js
View File

File diff suppressed because one or more lines are too long

11
public/css/built.css vendored
View File

File diff suppressed because one or more lines are too long

4
public/css/built.public.css vendored
View File

File diff suppressed because one or more lines are too long

7
public/css/style.css vendored
View File

@ -1103,10 +1103,3 @@ div.panel-body div.panel-body {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.dropzone .fallback-doc{
display:none;
}
.dropzone.dz-browser-not-supported .fallback-doc{
display:block;
}

7
resources/views/expenses/edit.blade.php
View File

@ -114,20 +114,13 @@
<div class="col-md-12 col-sm-8"> <div class="col-md-12 col-sm-8">
<div role="tabpanel" class="tab-pane" id="attached-documents" style="position:relative;z-index:9"> <div role="tabpanel" class="tab-pane" id="attached-documents" style="position:relative;z-index:9">
<div id="document-upload" class="dropzone"> <div id="document-upload" class="dropzone">
<div class="fallback">
<input name="documents[]" type="file" multiple />
</div>
<div data-bind="foreach: documents"> <div data-bind="foreach: documents">
<div class="fallback-doc">
<a href="#" class="fallback-doc-remove" data-bind="click: $parent.removeDocument"><i class="fa fa-close"></i></a>
<span data-bind="text:name"></span>
<input type="hidden" name="document_ids[]" data-bind="value: public_id"/> <input type="hidden" name="document_ids[]" data-bind="value: public_id"/>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
@endif @endif
</div> </div>
</div> </div>

7
resources/views/invoices/edit.blade.php
View File

@ -364,17 +364,10 @@
<div role="tabpanel" class="tab-pane" id="attached-documents" style="position:relative;z-index:9"> <div role="tabpanel" class="tab-pane" id="attached-documents" style="position:relative;z-index:9">
<div id="document-upload"> <div id="document-upload">
<div class="dropzone"> <div class="dropzone">
<div class="fallback">
<input name="documents[]" type="file" multiple />
</div>
<div data-bind="foreach: documents"> <div data-bind="foreach: documents">
<div class="fallback-doc">
<a href="#" class="fallback-doc-remove" data-bind="click: $parent.removeDocument"><i class="fa fa-close"></i></a>
<span data-bind="text:name"></span>
<input type="hidden" name="document_ids[]" data-bind="value: public_id"/> <input type="hidden" name="document_ids[]" data-bind="value: public_id"/>
</div> </div>
</div> </div>
</div>
@if ($invoice->hasExpenseDocuments()) @if ($invoice->hasExpenseDocuments())
<h4>{{trans('texts.documents_from_expenses')}}</h4> <h4>{{trans('texts.documents_from_expenses')}}</h4>
@foreach($invoice->expenses as $expense) @foreach($invoice->expenses as $expense)