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

[video] Only allow delete from library if user has DB write permission #6570

Merged
merged 1 commit into from Mar 1, 2015

Conversation

Projects
None yet
4 participants
@mvanderreek
Contributor

mvanderreek commented Feb 28, 2015

This will fix issue 15784

The code will check if the user is allowed to remove from database before prompting the delete from library dialog. If the user is not allowed to remove from database he gets a prompt with file is no longer available.

@MartijnKaijser

This comment has been minimized.

Show comment
Hide comment
@MartijnKaijser

MartijnKaijser Feb 28, 2015

Member

Looks fine to me. @mkortstiege for a check

Care to add the file in which these strings are used to our string.po ?
https://github.com/xbmc/xbmc/blob/master/language/English/strings.po#L1092
https://github.com/xbmc/xbmc/blob/master/language/English/strings.po#L2809
you can squash these changes in the same commit and force push to your branch.

Member

MartijnKaijser commented Feb 28, 2015

Looks fine to me. @mkortstiege for a check

Care to add the file in which these strings are used to our string.po ?
https://github.com/xbmc/xbmc/blob/master/language/English/strings.po#L1092
https://github.com/xbmc/xbmc/blob/master/language/English/strings.po#L2809
you can squash these changes in the same commit and force push to your branch.

@mvanderreek

This comment has been minimized.

Show comment
Hide comment
@mvanderreek

mvanderreek Feb 28, 2015

Contributor

I added the used strings to the strings.po as you requested @MartijnKaijser

Contributor

mvanderreek commented Feb 28, 2015

I added the used strings to the strings.po as you requested @MartijnKaijser

@MartijnKaijser

This comment has been minimized.

Show comment
Hide comment
@MartijnKaijser

MartijnKaijser Feb 28, 2015

Member

jenkins build this please

Member

MartijnKaijser commented Feb 28, 2015

jenkins build this please

@MartijnKaijser

This comment has been minimized.

Show comment
Hide comment
@MartijnKaijser

MartijnKaijser Feb 28, 2015

Member

ah i just noticed. we uses spaces and not tabs in our code. could you fix that?

Member

MartijnKaijser commented Feb 28, 2015

ah i just noticed. we uses spaces and not tabs in our code. could you fix that?

@mvanderreek

This comment has been minimized.

Show comment
Hide comment
@mvanderreek

mvanderreek Feb 28, 2015

Contributor

@MartijnKaijser no problem, I replaced all tabs with spaces. Could you let me know if it is ok now?

Contributor

mvanderreek commented Feb 28, 2015

@MartijnKaijser no problem, I replaced all tabs with spaces. Could you let me know if it is ok now?

@Montellese

This comment has been minimized.

Show comment
Hide comment
@Montellese

Montellese Feb 28, 2015

Member

Looks good IMO.

Member

Montellese commented Feb 28, 2015

Looks good IMO.

@Montellese Montellese added the Fix label Feb 28, 2015

@MartijnKaijser

This comment has been minimized.

Show comment
Hide comment
@MartijnKaijser

MartijnKaijser Feb 28, 2015

Member

jenkins build this please

Member

MartijnKaijser commented Feb 28, 2015

jenkins build this please

@MartijnKaijser MartijnKaijser added this to the I******* 15.0-alpha2 milestone Feb 28, 2015

@mkortstiege

This comment has been minimized.

Show comment
Hide comment
@mkortstiege
Member

mkortstiege commented Mar 1, 2015

+1

MartijnKaijser added a commit that referenced this pull request Mar 1, 2015

Merge pull request #6570 from delftswa2014/issue-15784
[video] Only allow delete from library if user has DB write permission

@MartijnKaijser MartijnKaijser merged commit 1c31ae4 into xbmc:master Mar 1, 2015

1 check passed

default Merged build finished.
Details
@MartijnKaijser

This comment has been minimized.

Show comment
Hide comment
@MartijnKaijser
Member

MartijnKaijser commented Mar 1, 2015

@mvanderreek thank you :)

@mvanderreek mvanderreek deleted the delftswa2014:issue-15784 branch Mar 2, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment