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

Merge branch 'master' of github.com:invoiceninja/invoiceninja

Browse Source
This commit is contained in:
Hillel Coren 2017-11-24 10:35:42 +02:00
commit 24ec472389
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Middleware/DuplicateSubmissionCheck.php
View File

@ -30,7 +30,7 @@ class DuplicateSubmissionCheck
$lastPage = session(SESSION_LAST_REQUEST_PAGE); $lastPage = session(SESSION_LAST_REQUEST_PAGE);
$lastTime = session(SESSION_LAST_REQUEST_TIME); $lastTime = session(SESSION_LAST_REQUEST_TIME);
if ($lastPage == $path && (microtime(true) - $lastTime <= 2)) { if ($lastPage == $path && (microtime(true) - $lastTime <= 1)) {
return redirect('/')->with('warning', trans('texts.duplicate_post')); return redirect('/')->with('warning', trans('texts.duplicate_post'));
} }

4
app/Ninja/Repositories/DocumentRepository.php
View File

@ -215,10 +215,10 @@ class DocumentRepository extends BaseRepository
['target' => '_blank'] ['target' => '_blank']
)->toHtml(); )->toHtml();
}) })
->addColumn('document_date', function ($model) { ->addColumn('created_at', function ($model) {
return Utils::dateToString($model->created_at); return Utils::dateToString($model->created_at);
}) })
->addColumn('document_size', function ($model) { ->addColumn('size', function ($model) {
return Form::human_filesize($model->size); return Form::human_filesize($model->size);
}); });