8000 fix(refactor): lockdown frappe.desk.reportview (bp #12713) by mergify[bot] · Pull Request #12732 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(refactor): lockdown frappe.desk.reportview (bp #12713) #12732

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
Closed
wants to merge 14 commits into from
Closed

fix(refactor): lockdown frappe.desk.reportview (bp #12713) #12732

wants to merge 14 commits into from

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Mar 31, 2021

This is an automatic backport of pull request #12713 done by Mergify.

Cherry-pick of a2ffea5 has failed:

On branch mergify/bp/version-12-hotfix/pr-12713
Your branch is up to date with 'origin/version-12-hotfix'.

You are currently cherry-picking commit a2ffea53f2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/__init__.py
	modified:   frappe/public/js/frappe/db.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/desk/reportview.py
	both modified:   frappe/model/db_query.py

Cherry-pick of 6d978a1 has failed:

On branch mergify/bp/version-12-hotfix/pr-12713
Your branch is ahead of 'origin/version-12-hotfix' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 6d978a1df0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/desk/reportview.py
	modified:   frappe/public/js/frappe/db.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/public/js/frappe/ui/group_by/group_by.js

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

10000
rmehta and others added 14 commits March 31, 2021 05:28
@rmehta
fix(refactor): lockdown frappe.desk.reportview
757b2f6 
(cherry picked from commit a2ffea5)

# Conflicts:
#	frappe/desk/reportview.py
#	frappe/model/db_query.py
@rmehta
fix(minor): fieldnames can't have commas
f180ce4 
(cherry picked from commit 511a5dd)
@rmehta
fix(minor): functions must end with bracket
4b65725 
(cherry picked from commit 0c99594)
@rmehta
fix(minor): handle as fieldnames
76fa04f 
(cherry picked from commit 0def975)
@rmehta
fix(minor): make group_by validation tighter
49a61e5 
(cherry picked from commit c9b3679)
@rmehta
fix(report): move count, aggregation to serverside
4d1b666 
(cherry picked from commit 6d978a1)

# Conflicts:
#	frappe/public/js/frappe/ui/group_by/group_by.js
@rmehta
fix(minor): disallow comments in fields
8b52157 
(cherry picked from commit f1f6477)
@rmehta
fix(minor): lockdown frappe.client.get_list
97402b1 
(cherry picked from commit 2248c6c)
@rmehta
fix(minor): tests and linting
4d41931 
(cherry picked from commit d959fc7)
@rmehta
fix(minor): return value in reportview.py
bd78385 
(cherry picked from commit 1aa8ada)
@rmehta
fix(minor): tests
6c83858 
(cherry picked from commit 868228b)
@rmehta
fix(minor): tests
3cad00e 
(cherry picked from commit 82399dd)
@rmehta
fix(reportview): test
ba65d7e 
(cherry picked from commit 337bdc9)
@rmehta @surajshetty3416
Update frappe/desk/reportview.py
cbeae05 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit 375cdea)
@mergify mergify bot added the conflicts label Mar 31, 2021
@mergify mergify bot mentioned this pull request Mar 31, 2021
Merged
@mergify mergify bot deleted the mergify/bp/version-12-hotfix/pr-12713 branch May 3, 2021 14:00
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 27, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@rmehta rmehta

Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rmehta @surajshetty3416
0