Skip to content

Update quota on files upload - #7592

Merged
rullzer merged 3 commits into
masterfrom
update-quota-on-files-upload
Dec 28, 2017
Merged

Update quota on files upload#7592
rullzer merged 3 commits into
masterfrom
update-quota-on-files-upload

Conversation

@skjnldsv

@skjnldsvskjnldsv commented Dec 21, 2017

Copy link
Copy Markdown
Member

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsvskjnldsv added 3. to review Waiting for reviews design Design, UI, UX, etc. feature: files low papercut Annoying recurring UX issue with possibly simple fix. labels Dec 21, 2017
@skjnldsvskjnldsv added this to the Nextcloud 13 milestone Dec 21, 2017
@skjnldsvskjnldsv self-assigned this Dec 21, 2017
</li>
<?php } ?>
<li id="quota" class="pinned <?php
<li id="quota" class="pinned <?php p($pinned===0?'first-pinned ':'') ?><?php

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes the pinned position of the quota if the files_trashbin app is disabled (meaning no other apps have registered another app-navigation pinned entry)

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍

@rullzerrullzer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 awesome!

rullzer
rullzer previously requested changes Dec 22, 2017

@rullzerrullzer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jsunit tests fail

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@codecov

codecovBot commented Dec 26, 2017

Copy link
Copy Markdown

Codecov Report

Merging #7592 into master will decrease coverage by 0.5%.
The diff coverage is 0%.

@@ Coverage Diff @@## master #7592 +/- ##
============================================
- Coverage 51.17% 50.67% -0.51% 
Complexity 24886 24886 ============================================
Files 1602 1538 -64 Lines 94750 87002 -7748 Branches 1368 0 -1368 ============================================
- Hits 48485 44085 -4400 + Misses 46265 42917 -3348
Impacted FilesCoverage ΔComplexity Δ
apps/files/templates/appnavigation.php0% <ø> (ø)0 <0> (ø)⬇️
apps/files/lib/Helper.php39.04% <0%> (-0.76%)36 <0> (ø)
apps/files_external/js/statusmanager.js
apps/systemtags/js/systemtagsinfoviewtoggleview.js
core/js/sharedialogresharerinfoview.js
core/js/contactsmenu.js
core/js/files/client.js
apps/files_external/js/app.js
core/js/share.js
core/js/sharedialogview.js
... and 57 more

@skjnldsv
skjnldsv dismissed rullzer’s stale reviewDecember 26, 2017 15:47

Jsunit now pass :)

@skjnldsv

Copy link
Copy Markdown
MemberAuthor

Build failure unrelated.

@skjnldsvskjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 26, 2017
@rullzer
rullzer merged commit 08cbfb6 into masterDec 28, 2017
@rullzer
rullzer deleted the update-quota-on-files-upload branch December 28, 2017 09:53
@skjnldsv

Copy link
Copy Markdown
MemberAuthor

Apparently there is a race condition sometimes where the quota status get requested before the MOVE request gets executed. Which result in an incomplete update. I'll fix it.

@MorrisJobkeMorrisJobke mentioned this pull request Jan 2, 2018
30 tasks
@skjnldsvskjnldsv mentioned this pull request Jan 3, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishdesignDesign, UI, UX, etc.feature: fileslowpapercutAnnoying recurring UX issue with possibly simple fix.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@skjnldsv@rullzer@MorrisJobke