Skip to content

Commit

Permalink
Merge branch 'develop' into bugfix/14347-relations-and-delete-for-site
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Feb 13, 2024
2 parents c2ff8bb + a98e62d commit 0a03e8e
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/BUG-REPORT-V3.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Bug ReportCraft 3
name: "Bug Report: Craft 3"
description: Report an issue or unexpected behavior pertaining to Craft 3
title: '[3.x]: '
labels:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/BUG-REPORT-V4.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Bug ReportCraft 4
name: "Bug Report: Craft 4"
description: Report an issue or unexpected behavior pertaining to Craft 4
title: '[4.x]: '
labels:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/BUG-REPORT-V5.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Bug ReportCraft 5
name: "Bug Report: Craft 5"
description: Report an issue or unexpected behavior pertaining to Craft 5
title: '[5.x]: '
labels:
Expand Down
33 changes: 27 additions & 6 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,41 @@
blank_issues_enabled: false
contact_links:
- name: Feature Request
url: https://github.com/craftcms/cms/discussions/new?category=ideas
about: Start a new discussion about your idea
- name: Documentation
url: https://docs.craftcms.com/
url: https://craftcms.com/docs
about: Read the official documentation
- name: Knowledge Base
url: https://craftcms.com/knowledge-base
about: Find answers to common problems
about: Find official answers to common problems
- name: Developer Support Services
url: https://craftcms.com/support-services
about: Priority developer support from the team that makes Craft
- name: Craft Discord
url: https://craftcms.com/discord
about: Meet the community
- name: Stack Exchange
- name: Craft Stack Exchange
url: https://craftcms.stackexchange.com/
about: Get help and help others
- name: "Feature Request: Craft CMS"
url: https://github.com/craftcms/cms/discussions/new?category=ideas
about: Make a feature request or enhancement for Craft CMS
- name: "Feature Request: Craft Console / Plugin Store"
url: https://github.com/craftcms/console/discussions/new?category=ideas
about: Make a feature request or enhancement for Craft Console or the Plugin Store
- name: "Feature Request: Craft Cloud"
url: https://github.com/craftcms/cloud/discussions/new?category=ideas
about: Make a feature request or enhancement for Craft Cloud
- name: "Feature Request: Craft Commerce"
url: https://github.com/craftcms/commerce/discussions/new?category=ideas
about: Make a feature request or enhancement for Craft Commerce
- name: "Bug Report: Craft CMS"
url: https://github.com/craftcms/cms/issues/new/choose
about: Create a bug report for Craft CMS
- name: "Bug Report: Craft Console / Plugin Store"
url: https://github.com/craftcms/console/issues/new/choose
about: Create a bug report for Craft Console or the Plugin Store
- name: "Bug Report: Craft Cloud"
url: https://craftcms.com/contact
about: Create a bug report for Craft Cloud
- name: "Bug Report: Craft Commerce"
url: https://github.com/craftcms/commerce/issues/new/choose
about: Create a bug report for Craft Commerce
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

- Fixed a bug where read/write splitting was always getting disabled for GraphQL POST requests. ([#14324](https://github.com/craftcms/cms/issues/14324))
- Fixed a bug where GraphQL schema edit pages could include empty category headings.
- Fixed a bug where asset slideouts weren’t showing validation errors on the Filename field. ([#14329](https://github.com/craftcms/cms/issues/14329))
- Fixed a bug where element slideouts would open when long-pressing on an element’s “Remove” button within an element select input.

## 4.7.2.1 - 2024-02-08

Expand Down
1 change: 1 addition & 0 deletions src/elements/Asset.php
Original file line number Diff line number Diff line change
Expand Up @@ -2666,6 +2666,7 @@ protected function metaFieldsHtml(bool $static): string
return implode("\n", [
Cp::textFieldHtml([
'label' => Craft::t('app', 'Filename'),
'attribute' => 'newLocation',
'id' => 'new-filename',
'name' => 'newFilename',
'value' => $this->_filename,
Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/cp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/cp.js.map

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions src/web/assets/cp/src/js/BaseElementSelectInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,11 @@ Craft.BaseElementSelectInput = Garnish.Base.extend(

if (this.settings.editable) {
this._handleShowElementEditor = (ev) => {
// don't open the edit slideout if we are tapholding to drag
if (ev.type === 'taphold' && ev.target.nodeName === 'BUTTON') {
return;
}

var $element = $(ev.currentTarget);
if (
Garnish.hasAttr($element, 'data-editable') &&
Expand Down

0 comments on commit 0a03e8e

Please sign in to comment.