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

Add example for numRows #770

Merged
merged 3 commits into from
Aug 2, 2023
Merged

Conversation

kitzberger
Copy link
Contributor

No description provided.

@brotkrueml brotkrueml self-requested a review July 31, 2023 12:32
Copy link
Contributor

@brotkrueml brotkrueml left a comment

Choose a reason for hiding this comment

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

@kitzberger Thanks for your contribution. I suggest to split the one example into two examples - perhaps with explaining what they do with a small introduction sentence:

  • "Get the total number of content elements available"
  • "Get the number of all content elements in col pos = 1"

As numRows is a function the page.10.variables is not really necessary in the example. I assume, page.10 is a FLUIDTEMPLATE? If you want to keep it, please also add the FLUIDTEMPLATE so the reader can grasp the context, like:

10 = FLUIDTEMPLATE
10 {
    # ... your other configuration
    variables {
        # the examples
    }
}

What do you think?

@kitzberger
Copy link
Contributor Author

What do you think?

Yeah, you're right! I've added a little description for the "more complex" snippet and removed the simpler one.

@brotkrueml brotkrueml merged commit 3543204 into TYPO3-Documentation:main Aug 2, 2023
2 checks passed
@github-actions
Copy link

github-actions bot commented Aug 2, 2023

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 8d61084... Add example for numRows
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging Documentation/Functions/Numrows.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Numrows.rst

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-770-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 8d610840ddc7c26f1077d35711ce60cb6def4318,34ea1d122bbd02bd9f13e2ad04b38afb8122796f,842526c49826b97973e995d3521a3851f93c511f
# Push it to GitHub
git push --set-upstream origin backport-770-to-11.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-11.5

Then, create a pull request where the base branch is 11.5 and the compare/head branch is backport-770-to-11.5.

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

Successfully merging this pull request may close these issues.

2 participants