Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix document upload limit #2017

Merged
merged 1 commit into from
Nov 11, 2018
Merged

fix: fix document upload limit #2017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/Http/Controllers/ContactsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ public function store(Request $request)
*/
public function show(Contact $contact)
{

// make sure we don't display a significant other if it's not set as a
// real contact
if ($contact->is_partial) {
Expand Down
2 changes: 1 addition & 1 deletion public/js/app.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"/js/app.js": "/js/app.js?id=d03bd167de247234d405",
"/js/app.js": "/js/app.js?id=f24fc229cb804ee92432",
"/css/app-ltr.css": "/css/app-ltr.css?id=9c020413c85ee7782dd5",
"/css/app-rtl.css": "/css/app-rtl.css?id=e5921123c1fd31bed1a6",
"/css/stripe.css": "/css/stripe.css?id=64c68c04c4e475fcc7c6",
Expand Down
6 changes: 3 additions & 3 deletions resources/assets/js/components/people/document/DocumentList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@
<h3>
📄 {{ $t('people.document_list_title') }}

<span class="fr relative" style="top: -7px;" v-show="!reachLimit">
<span class="fr relative" style="top: -7px;" v-show="reachLimit == 'false'">
<a @click="displayUploadZone = true" class="btn edit-information" v-if="displayUploadZone == false && displayUploadError == false && displayUploadProgress == false">{{ $t('people.document_list_cta') }}</a>
<a @click="displayUploadZone = false; displayUploadError = false; displayUploadProgress = false" class="btn edit-information" v-if="displayUploadZone || displayUploadError || displayUploadProgress">{{ $t('app.cancel') }}</a>
</span>
</h3>
</div>

<p v-show="reachLimit">{{ $t('settings.storage_upgrade_notice') }}</p>
<p v-show="reachLimit == 'true'">{{ $t('settings.storage_upgrade_notice') }}</p>

<!-- EMPTY STATE -->
<div class="ltr w-100 pt2" v-if="displayUploadZone == false && displayUploadError == false && displayUploadProgress == false && documents.length == 0">
Expand Down Expand Up @@ -230,7 +230,7 @@
type: String,
},
reachLimit: {
type: Boolean,
type: String,
},
},

Expand Down
2 changes: 1 addition & 1 deletion resources/views/people/documents/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

@else

<document-list hash="{{ $contact->hashID() }}" reach-limit="{{ $contact->account->hasReachedAccountStorageLimit() }}"></document-list>
<document-list hash="{{ $contact->hashID() }}" reach-limit="{{ json_encode($contact->account->hasReachedAccountStorageLimit()) }}"></document-list>

@endif
</div>
Expand Down