minor fix: wrong and #22242
Merged
minor fix: wrong and #22242
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dosubot
bot
added
the
size:XS
crazywoola
approved these changes
Jul 12, 2025
yijiaquan
pushed a commit
to yijiaquan/dify
that referenced
this pull request
Jul 14, 2025
(cherry picked from commit 6c233e0)
eggbrid2
pushed a commit
to eggbrid2/dify
that referenced
this pull request
Jul 15, 2025
* main: (533 commits) chore: bump nextjs to 15.3 (langgenius#22262) Provides a set of Kubernetes manifests supporting version 1.6.0 (langgenius#22287) improve opik workflow_trace span name to node name (langgenius#22356) fix: aliyun trace title&description (langgenius#22347) Update README.md (langgenius#22351) fix: close session before doing long latency operation (langgenius#22306) feat(api/repo): Allow to config repository implementation (langgenius#21458) Fix: Remove height and overflow style settings (langgenius#22327) Chore: Replace lodash/noop with lodash-es/noop (langgenius#22331) fix: error parsing object type parameters for code node (langgenius#22230) fix: prevent trigger form submit action when press 'enter' (langgenius#22313) Update README.md (langgenius#22305) test: add comprehensive unit tests for login decorator (langgenius#22294) fixing Enum part in backend and making it same as front end (langgenius#22296) test(web): add password regexp test case (langgenius#22308) fix(ui): prevent var icon hidden when only one var in list of start node (langgenius#22290) fix: tool's model selector and app selector not work (langgenius#22291) chore: bump ruff to 0.12.x (langgenius#22259) minor fix: wrong and (langgenius#22242) Add unit test for account service (langgenius#22278) ... # Conflicts: # web/app/(commonLayout)/apps/AppCard.tsx # web/app/(commonLayout)/apps/Apps.tsx # web/app/(commonLayout)/apps/page.tsx # web/app/(commonLayout)/datasets/Container.tsx # web/app/components/base/logo/dify-logo.tsx # web/app/components/base/markdown.tsx # web/app/components/header/account-dropdown/workplace-selector/index.tsx # web/app/components/header/explore-nav/index.tsx # web/app/components/header/index.tsx # web/app/components/header/nav/index.tsx # web/app/components/header/plugins-nav/index.tsx # web/app/components/header/tools-nav/index.tsx # web/app/components/tools/provider-list.tsx # web/app/components/workflow/nodes/_base/panel.tsx # web/app/reset-password/layout.tsx # web/app/signin/_header.tsx # web/app/signin/layout.tsx # web/app/signin/normalForm.tsx # web/i18n/zh-Hans/common.ts # web/i18n/zh-Hans/explore.ts # web/package.json # web/pnpm-lock.yaml # web/themes/dark.css # web/themes/light.css
6 tasks
tutkun
pushed a commit
to tutkun/dify
that referenced
this pull request
Aug 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Important
Fixes #<issue number>.Summary
This PR fixes an incorrect logical operator in the database query filter for the AppMCPServer controller. The issue was in the
getmethod where the filter condition was using theandoperator incorrectly within a single filter statement, which would cause a logical error in the SQL query generation.Changes made:
AppMCPServer.id == server_id and AppMCPServer.tenant_id == current_user.current_tenant_idinto two separate.filter()callsTechnical details:
api/controllers/console/appget(self, server_id)The change improves code reliability by following SQLAlchemy best practices for chaining multiple filter conditions.
Screenshots
Checklist
dev/reformat(backend) andcd web && npx lint-staged(frontend) to appease the lint gods