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

Fixed different app author scenarios not working #29381

Merged
merged 6 commits into from
Jan 8, 2018
Merged

Fixed different app author scenarios not working #29381

merged 6 commits into from
Jan 8, 2018

Conversation

splitt3r
Copy link
Contributor

Description

If there are multiple app authors or the app author adds email / url to tag in info.xml oC is not able to display the information correctly.

Examples:

Related Issue

PR #29221 is somehow related.

How Has This Been Tested?

Tested in FF, Chrome and Edge

Screenshots (if appropriate):

App settings

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@CLAassistant
Copy link

CLAassistant commented Oct 28, 2017

CLA assistant check
All committers have signed the CLA.

@codecov
Copy link

codecov bot commented Oct 28, 2017

Codecov Report

Merging #29381 into master will increase coverage by 1.05%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #29381      +/-   ##
============================================
+ Coverage     60.21%   61.27%   +1.05%     
- Complexity    17188    17472     +284     
============================================
  Files          1030     1044      +14     
  Lines         57274    57676     +402     
============================================
+ Hits          34490    35343     +853     
+ Misses        22784    22333     -451
Impacted Files Coverage Δ Complexity Δ
lib/private/DB/ConnectionFactory.php 60.52% <0%> (-2.49%) 21% <0%> (ø)
lib/private/DB/Connection.php 63.43% <0%> (-2.46%) 48% <0%> (+3%)
lib/private/AvatarManager.php 58.33% <0%> (-1.67%) 8% <0%> (ø)
lib/private/User/Session.php 62.13% <0%> (-1.02%) 124% <0%> (+5%)
core/Application.php 27% <0%> (-1%) 2% <0%> (ø)
lib/private/Config.php 88.04% <0%> (-0.85%) 38% <0%> (+1%)
apps/files_sharing/lib/AppInfo/Application.php 44.26% <0%> (-0.74%) 4% <0%> (ø)
lib/private/Files/Storage/Wrapper/Encryption.php 67.82% <0%> (-0.7%) 154% <0%> (+3%)
lib/private/legacy/api.php 41.7% <0%> (-0.18%) 81% <0%> (+1%)
core/Controller/LostController.php 88.09% <0%> (-0.15%) 32% <0%> (+2%)
... and 63 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 98e73e5...04d8ed7. Read the comment docs.

app.author = app.author.join(', ');
}

if (_.isObject(app.author) && !_.isUndefined(app.author['@value'])) {
Copy link
Member

Choose a reason for hiding this comment

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

does this work if app.author is an array of objects?

Copy link
Contributor Author

@splitt3r splitt3r Oct 30, 2017

Choose a reason for hiding this comment

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

Good point 😁. I will ivestigate and update the code.

@PVince81 PVince81 modified the milestones: development, planned Nov 8, 2017
@PVince81 PVince81 modified the milestones: planned, development Nov 22, 2017
@PVince81
Copy link
Contributor

would be good to add a JS unit test, at least of the parse author logic and its two code paths.

You can use make test-js-debug

@splitt3r
Copy link
Contributor Author

Ok, i will have a look at it.

Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍 thanks

@PVince81
Copy link
Contributor

PVince81 commented Jan 8, 2018

I've restarted the Travis tests, let's hope it was a one-time thing

@splitt3r
Copy link
Contributor Author

splitt3r commented Jan 8, 2018

Hm doesn´t look that good 😞. Are these errors related to my changes?

@phil-davis
Copy link
Contributor

The Travis tests that fail are the UI tests - that is because this PR is from a forked repo, so the SauceLabs credentials are not available to the job.

@splitt3r
Copy link
Contributor Author

splitt3r commented Jan 8, 2018

Thanks for the clarification :)

@phil-davis
Copy link
Contributor

I pushed this branch into my fork, where I have my own SauceLabs credentials.
https://github.com/phil-davis/core/pull/135
That is running the UI tests now and will demonstrate (hopefully!) that they pass.

@phil-davis
Copy link
Contributor

@splitt3r @PVince81 Travis UI tests passed in my fork. Suitable god privs could be used to merge this PR, overriding the Travis fail here.

@PVince81 PVince81 merged commit e668bea into owncloud:master Jan 8, 2018
@PVince81
Copy link
Contributor

PVince81 commented Jan 8, 2018

@splitt3r can you backport to stable10 ? Basically create a branch off stable10, cherry pick your commits and send a PR from that branch to stable10.

If not let us know and we'll take care.

@phil-davis
Copy link
Contributor

Care taken :)
Backport stable10 #30043
It is easy to do it in the "real" core repo - saves the hassle of UI test fails.

@splitt3r splitt3r deleted the fix-app-author branch January 8, 2018 18:39
@lock
Copy link

lock bot commented Aug 1, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Aug 1, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants