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.

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

Update quota on files upload #7592

Merged
merged 3 commits into from
Dec 28, 2017
Merged

Update quota on files upload #7592

merged 3 commits into from
Dec 28, 2017

Conversation

skjnldsv
Copy link
Member

@skjnldsv skjnldsv commented Dec 21, 2017

Fix #6690
capture d ecran_2017-09-27_16-48-13

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

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)

Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Tested and works 👍

Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

👍 awesome!

Copy link
Member

@rullzer rullzer left a comment

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
Copy link

codecov bot commented Dec 26, 2017

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 Files Coverage Δ Complexity Δ
apps/files/templates/appnavigation.php 0% <ø> (ø) 0 <0> (ø) ⬇️
apps/files/lib/Helper.php 39.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 review December 26, 2017 15:47

Jsunit now pass :)

@skjnldsv skjnldsv requested a review from rullzer December 26, 2017 15:47
@skjnldsv
Copy link
Member Author

Build failure unrelated.

@skjnldsv skjnldsv 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 master Dec 28, 2017
@rullzer rullzer deleted the update-quota-on-files-upload branch December 28, 2017 09:53
@skjnldsv
Copy link
Member Author

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.

@MorrisJobke MorrisJobke mentioned this pull request Jan 2, 2018
30 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish design Design, UI, UX, etc. feature: files low papercut Annoying recurring issue with possibly simple fix.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants