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.

Sign up for GitHub

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

Jump to bottom

Fix template rendering for 'blank' templates #9914

Merged
merged 1 commit into from
Jul 30, 2014
Merged

Fix template rendering for 'blank' templates #9914

merged 1 commit into from
Jul 30, 2014

Conversation

MorrisJobke
Copy link
Contributor

See http://api.owncloud.org/classes/OCP.AppFramework.Http.TemplateResponse.html setRenderAs

$renderAs string admin, user or blank.
Admin also prints the admin settings header and footer, user renders the normal normal page including footer and header and blank just renders the plain template

This was previously done in a helper class https://github.com/owncloud/music/blob/stable5/appframework/http/templateresponse.php#L118 -> https://github.com/owncloud/music/blob/stable5/appframework/core/api.php#L385:L389

cc @Raydiation @DeepDiver1975 @PVince81 @karlitschek
This needs backport to stable7 because it's a broken behaviour of the public API.

@MorrisJobke
Copy link
Contributor Author

And it's essential for the music app ;)

@MorrisJobke
Copy link
Contributor Author

And this also needs a backport to stable6. Then the music app master code base runs on stable6 and stable7.

@BernhardPosselt
Copy link
Contributor

👍

@MorrisJobke
Copy link
Contributor Author

@owncloud-bot retest this please

@ghost
Copy link

ghost commented Jul 28, 2014

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

@MorrisJobke
Copy link
Contributor Author

gnaah ... always different swift tests -.-

@LukasReschke
Copy link
Member

Works - tested 👍

@MorrisJobke
Copy link
Contributor Author

@owncloud-bot retest this please

@MorrisJobke MorrisJobke modified the milestone: ownCloud 8 Jul 29, 2014
@ghost
Copy link

ghost commented Jul 29, 2014

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

@jancborchardt jancborchardt mentioned this pull request Jul 29, 2014
Open
@jancborchardt
Copy link
Member

@MorrisJobke both @sumansai14 and I tested this, and it works again! 👍 :)

@jancborchardt
Copy link
Member

@owncloud-bot retest this please

@jancborchardt jancborchardt added this to the ownCloud 7.0.1 milestone Jul 29, 2014
@MorrisJobke
Copy link
Contributor Author

@butonic @DeepDiver1975 What to do with those swift tests?

OpenCloud\ObjectStore\Exception\ContainerException: The API returned this error: <html><h1>Conflict</h1><p>There was a conflict when trying to complete your request.</p></html>. You might have to delete all existing objects before continuing.

@MorrisJobke
Copy link
Contributor Author

@karlitschek Is the backport permitted?

@karlitschek
Copy link
Contributor

Yes. Backport please

@ghost
Copy link

ghost commented Jul 29, 2014

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

@jancborchardt
Copy link
Member

@butonic @DeepDiver1975 @MorrisJobke so what about the failing swift tests? Are they related?

@icewind1991
Copy link
Contributor

rebased, iirc a fix for the swift tests is in master

@scrutinizer-notifier
Copy link

The inspection completed: No new issues

@ghost
Copy link

ghost commented Jul 29, 2014

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

@jancborchardt
Copy link
Member

Still failing – what to do here? @DeepDiver1975 @icewind1991 please advise.

@MorrisJobke
Copy link
Contributor Author

The same tests fail on master -.-

@DeepDiver1975
Copy link
Member

failing unit tests are unrelated -> merge

DeepDiver1975 added a commit that referenced this pull request Jul 30, 2014
@DeepDiver1975
Merge pull request #9914 from owncloud/fix-appframework-blank-template
7d6221d 
Fix template rendering for 'blank' templates
@DeepDiver1975 DeepDiver1975 merged commit 7d6221d into master Jul 30, 2014
@DeepDiver1975 DeepDiver1975 deleted the fix-appframework-blank-template branch July 30, 2014 08:31
@MorrisJobke
Copy link
Contributor Author

stable7 185e41a
stable6 ca29c8b

@lock lock bot locked as resolved and limited conversation to collaborators Aug 17, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
3 - To Review Type:Bug
Projects
None yet
Milestone
7.0.1
Development

Successfully merging this pull request may close these issues.
8 participants
@MorrisJobke @BernhardPosselt @LukasReschke @jancborchardt @karlitschek @icewind1991 @scrutinizer-notifier @DeepDiver1975