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

Do not count the size of shared folder on total #5399

Merged
merged 1 commit into from
Nov 6, 2013

Conversation

friscoMad
Copy link
Contributor

Not sure if it is a desired feature or not, but as it does not count toward users quota is a bit misleading to see a total size over your quota and that leads to users creating issues like: #5362, #5363

I think that a global progress bar with different colours as it progresses, is a lot easier to understand but that is a new feature with UI and I don't know how do you manage that.

@Niduroki
Copy link
Member

#2796 #4437

@DeepDiver1975
Copy link
Member

@frisco82 can you please rebase? THX

@friscoMad
Copy link
Contributor Author

No problem, rebased.

@PVince81
Copy link
Contributor

PVince81 commented Nov 5, 2013

Closing this as duplicate of #2796. Let's follow up there.

@PVince81 PVince81 closed this Nov 5, 2013
@PVince81
Copy link
Contributor

PVince81 commented Nov 5, 2013

Sorry guys, I meant to close another issue. Reopening.

@PVince81
Copy link
Contributor

PVince81 commented Nov 5, 2013

@frisco82 can you confirm that shared files are indeed NOT counted in a user's quota ?
I just had a try and it doesn't seem to be the case any more in OC6.

@@ -610,6 +598,24 @@ var FileList={
}
}
},
_calculateFileSummary: function() {
var result = new Array();
result['totalDirs'] = 0;
Copy link
Contributor

Choose a reason for hiding this comment

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

If you come from the PHP world you might be interested to know that you can also write this as:

result.totalDirs = 0;

😄

Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm, I see this all over the place. Do you might changing it and use the dot notation instead ? It makes the code more readable.

@friscoMad
Copy link
Contributor Author

@frisco82 can you confirm that shared files are indeed NOT counted in a user's quota ?
I just had a try and it doesn't seem to be the case any more in OC6.

Quotas are a mystery for me, I can assure that under windows and 1 level sharing, shared items do not counts toward quota.
But I have seen in other issues that under unix system user quotas can be used for owncloud user quotas and I am not sure about how that affects shared folders and I really don't know what can happen when you reshare with upload and a 3rd person modifies or upload new files to a reshared folder, that could go to anybody's quota AFAIK 😄

@PVince81
Copy link
Contributor

PVince81 commented Nov 5, 2013

@frisco82 have a look at #2796
I tried to write up how I'd expect quota to work.

Please also fix this PR as it fixes part of the issues 😃

@friscoMad
Copy link
Contributor Author

Dot notation fixed.

@PVince81
Copy link
Contributor

PVince81 commented Nov 5, 2013

Excellent Indy... I mean @frisco82 😉 👍

@PVince81
Copy link
Contributor

PVince81 commented Nov 5, 2013

CC @owncloud/designers for information. This will make whatever is displayed in the list match the real thing.

This needs another reviewer @karlitschek @DeepDiver1975 @Kondou-ger @kabum

} else if ($value.data('type') === 'file') {
result.totalFiles++;
}
if ($value.data('size') !== undefined && $value.data('id') !== -1) { //Skip shared as it does not count toward quota
Copy link
Member

Choose a reason for hiding this comment

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

Please split this long line

Changed all array access to dot notation

Split comment in a second line
@ghost
Copy link

ghost commented Nov 6, 2013

Test passed.
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/1924/

@PVince81
Copy link
Contributor

PVince81 commented Nov 6, 2013

@Kondou-ger the long line has been split up!

@ghost ghost assigned friscoMad Nov 6, 2013
@MorrisJobke
Copy link
Contributor

👍

Thanks!

MorrisJobke added a commit that referenced this pull request Nov 6, 2013
Do not count the size of shared folder on total
@MorrisJobke MorrisJobke merged commit a0ee6ae into owncloud:master Nov 6, 2013
@vvhof vvhof mentioned this pull request Feb 6, 2015
@lock lock bot locked as resolved and limited conversation to collaborators Aug 19, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants