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

[5.0] Modal field for Modal_Menu #41629

Merged
merged 5 commits into from
Sep 12, 2023
Merged

Conversation

Fedik
Copy link
Member

@Fedik Fedik commented Sep 7, 2023

Summary of Changes

Changing Modal_Menu field to use new modal dialog.
The same as #40462 but for Menu.

It may not hit 5.0, but in future will need to update anyway.

TODO: Will be need to update after #41600

Testing Instructions

Run npm install

Create/edit "Menu Item Type": "Menu Item Alias": create/edit/select "Menu Item" value.

Actual result BEFORE applying this Pull Request

Works with old bs modal

Expected result AFTER applying this Pull Request

Works with new dialog.

Link to documentations

Please select:

  • Documentation link for docs.joomla.org:
  • No documentation changes for docs.joomla.org needed
  • Pull Request link for manual.joomla.org: as part of Content select in modal Manual#178
  • No documentation changes for manual.joomla.org needed

Reference:

commit 12fc231
Merge: b13fa30 0f69337
Author: Fedik <getthesite@gmail.com>
Date:   Thu Sep 7 11:01:11 2023 +0300

    Merge branch '5.0-dev' into popup-field-menu

commit b13fa30
Merge: d57dd3b 0a52306
Author: Fedik <getthesite@gmail.com>
Date:   Sat Sep 2 19:29:08 2023 +0300

    Merge branch '5.0-dev' into popup-field-menu

     Conflicts:
    	administrator/components/com_content/src/Controller/ArticleController.php
    	administrator/components/com_content/src/Field/Modal/ArticleField.php

commit d57dd3b
Author: Fedik <getthesite@gmail.com>
Date:   Sat Sep 2 17:25:36 2023 +0300

    MenuField modal

commit 2410d53
Author: Fedik <getthesite@gmail.com>
Date:   Sat Sep 2 17:24:44 2023 +0300

    MenuField modal

commit 2f3d3a9
Merge: 6c5d2ce 45f7764
Author: Fedik <getthesite@gmail.com>
Date:   Sat Sep 2 14:49:41 2023 +0300

    Merge branch '5.0-dev' into popup-field3

commit 6c5d2ce
Merge: c32d9f0 beec751
Author: Fedik <getthesite@gmail.com>
Date:   Sun Aug 27 12:47:51 2023 +0300

    Merge branch '5.0-dev' into popup-field3

commit c32d9f0
Author: Fedik <getthesite@gmail.com>
Date:   Thu Aug 24 17:33:46 2023 +0300

    tests

commit 52f1862
Author: Fedik <getthesite@gmail.com>
Date:   Thu Aug 24 17:33:33 2023 +0300

    tests

commit a3e87f5
Author: Fedik <getthesite@gmail.com>
Date:   Thu Aug 24 15:21:37 2023 +0300

    csscs

commit 901051b
Author: Fedik <getthesite@gmail.com>
Date:   Thu Aug 24 15:14:23 2023 +0300

    Bigger size for content select dialog and default

commit cc58f7f
Author: Fedik <getthesite@gmail.com>
Date:   Wed Aug 23 12:07:43 2023 +0300

    Asset name

commit 2cc085b
Author: Fedir Zinchuk <getthesite@gmail.com>
Date:   Wed Aug 23 12:06:03 2023 +0300

    Apply suggestions from code review

    Co-authored-by: Brian Teeman <brian@teeman.net>

commit e98fadf
Author: Fedik <getthesite@gmail.com>
Date:   Wed Aug 23 12:01:35 2023 +0300

    Field get/set

commit 71f1ee2
Merge: afdac98 0c895c3
Author: Fedik <getthesite@gmail.com>
Date:   Wed Aug 23 11:42:36 2023 +0300

    Merge branch '5.0-dev' into popup-field3

commit afdac98
Author: Fedik <getthesite@gmail.com>
Date:   Wed Aug 23 11:40:53 2023 +0300

    Allow custom messageType

commit c2c25ef
Author: Fedik <getthesite@gmail.com>
Date:   Mon Aug 21 16:30:35 2023 +0300

    Asset name

commit 6842837
Author: Fedik <getthesite@gmail.com>
Date:   Mon Aug 21 16:25:48 2023 +0300

    Asset name

commit 4412616
Merge: 45dd0e6 fbdd32b
Author: Fedik <getthesite@gmail.com>
Date:   Mon Aug 21 16:22:58 2023 +0300

    Merge branch '5.0-dev' into popup-field3

     Conflicts:
    	build/media_source/com_content/joomla.asset.json

commit 45dd0e6
Author: Fedik <getthesite@gmail.com>
Date:   Tue May 2 16:29:48 2023 +0300

    phpcs

commit 22eca10
Author: Fedik <getthesite@gmail.com>
Date:   Tue May 2 16:15:42 2023 +0300

    Sublayout extra-buttons that allows extra buttons, eg "assoc. propagate"

commit 4357afc
Author: Fedik <getthesite@gmail.com>
Date:   Sun Apr 23 14:01:06 2023 +0300

    phpcs

commit 60d6fe8
Author: Fedik <getthesite@gmail.com>
Date:   Sun Apr 23 13:57:49 2023 +0300

    phpcs

commit b00863d
Author: Fedik <getthesite@gmail.com>
Date:   Sun Apr 23 13:47:21 2023 +0300

    phpcs

commit 4120d72
Author: Fedik <getthesite@gmail.com>
Date:   Sun Apr 23 13:23:21 2023 +0300

    ModalSelect field

    Squashed commit of the following:

    commit cfea2ada6e38857690e7837a5cddd30592709d85
    Author: Fedik <getthesite@gmail.com>
    Date:   Sun Apr 23 13:15:05 2023 +0300

        Value

    commit 098fbcc75faff468e5541810482e6be44b0070c1
    Author: Fedik <getthesite@gmail.com>
    Date:   Sun Apr 23 12:53:18 2023 +0300

        Change

    commit 895a5e86e8dcd7c99169ff0fac373cc7a43db94a
    Author: Fedik <getthesite@gmail.com>
    Date:   Sun Apr 23 12:52:40 2023 +0300

        Modal select, change only once

    commit ac48d1a87204bbf9f92e634862986e6ba71b098a
    Author: Fedik <getthesite@gmail.com>
    Date:   Sun Apr 23 12:50:49 2023 +0300

        Field modal select fixes

    commit cc1bd15
    Author: Fedik <getthesite@gmail.com>
    Date:   Sun Apr 23 11:59:59 2023 +0300

        Hide toolbar

    commit 989b530
    Merge: 7b7970c b8b35f3
    Author: Fedik <getthesite@gmail.com>
    Date:   Sun Apr 23 11:55:34 2023 +0300

        Merge branch '5.0-dev' into popup-field2

    commit 7b7970c
    Author: Fedik <getthesite@gmail.com>
    Date:   Tue Apr 18 18:28:23 2023 +0300

        Content dialog field, fixes

    commit 1295c08
    Author: Fedik <getthesite@gmail.com>
    Date:   Tue Apr 18 18:23:38 2023 +0300

        Content dialog field, fixes

    commit 97c7dc7
    Author: Fedik <getthesite@gmail.com>
    Date:   Tue Apr 18 17:14:58 2023 +0300

        Content dialog field, fix lang

    commit 4298c93
    Author: Fedik <getthesite@gmail.com>
    Date:   Tue Apr 18 16:44:32 2023 +0300

        Content dialog field, rename to modal-content-select

    commit 0dc3b10
    Author: Fedik <getthesite@gmail.com>
    Date:   Tue Apr 18 16:32:27 2023 +0300

        Content dialog field, ModalSelectField, ArticleField

    commit dd92b95
    Author: Fedik <getthesite@gmail.com>
    Date:   Tue Apr 18 16:04:02 2023 +0300

        Content dialog field, ModalSelectField, ArticleField

    commit 77a2b81
    Author: Fedik <getthesite@gmail.com>
    Date:   Tue Apr 18 15:53:13 2023 +0300

        Content dialog field, ModalSelectField, ArticleField

    commit 9e412fa
    Author: Fedik <getthesite@gmail.com>
    Date:   Tue Apr 18 14:45:52 2023 +0300

        Content dialog field, ModalSelectField, ArticleField

    commit 77073ee
    Author: Fedik <getthesite@gmail.com>
    Date:   Tue Apr 18 14:38:11 2023 +0300

        Content dialog field, ModalSelectField, ArticleField

    commit 8a039a6
    Author: Fedik <getthesite@gmail.com>
    Date:   Tue Apr 18 13:52:47 2023 +0300

        Content dialog field, ModalSelectField

    commit 4570541
    Author: Fedik <getthesite@gmail.com>
    Date:   Mon Apr 17 20:10:42 2023 +0300

        Content dialog field, ModalSelectField

    commit caf73b5
    Author: Fedik <getthesite@gmail.com>
    Date:   Mon Apr 17 19:32:34 2023 +0300

        Content dialog field, ModalSelectField

    commit 0eb657e
    Author: Fedik <getthesite@gmail.com>
    Date:   Mon Apr 17 19:17:18 2023 +0300

        Content dialog field, ModalSelectField

    commit c84bc7f
    Author: Fedik <getthesite@gmail.com>
    Date:   Mon Apr 17 17:55:24 2023 +0300

        Content dialog field, clean up

    commit 40076a5
    Author: Fedik <getthesite@gmail.com>
    Date:   Mon Apr 17 17:53:55 2023 +0300

        Content dialog field, better names

    commit a12ed99
    Author: Fedik <getthesite@gmail.com>
    Date:   Mon Apr 17 16:00:49 2023 +0300

        Content dialog field, isChanged

    commit 940d86e
    Author: Fedik <getthesite@gmail.com>
    Date:   Mon Apr 17 15:46:59 2023 +0300

        Content dialog field, setupField

    commit 25bf2cf
    Author: Fedik <getthesite@gmail.com>
    Date:   Mon Apr 17 14:50:10 2023 +0300

        Content dialog field, fixes

    commit 0bedbc8
    Author: Fedik <getthesite@gmail.com>
    Date:   Mon Apr 17 13:12:19 2023 +0300

        Content dialog field, fixes

    commit 398e576
    Author: Fedik <getthesite@gmail.com>
    Date:   Mon Apr 17 12:45:34 2023 +0300

        Content dialog field, checkin on close

    commit 4b8c18f
    Author: Fedik <getthesite@gmail.com>
    Date:   Mon Apr 17 12:03:57 2023 +0300

        Content dialog field, script options

    commit 3c1c3f0
    Author: Fedik <getthesite@gmail.com>
    Date:   Mon Apr 17 12:01:49 2023 +0300

        Content dialog field, script options

    commit 59c17b4
    Author: Fedik <getthesite@gmail.com>
    Date:   Sat Apr 15 17:59:08 2023 +0300

        Content dialog field, modalreturn redirect

    commit 3cdb25c
    Author: Fedik <getthesite@gmail.com>
    Date:   Sat Apr 15 17:52:01 2023 +0300

        Content dialog field, modalreturn redirect

    commit 809e971
    Author: Fedik <getthesite@gmail.com>
    Date:   Sat Apr 15 17:46:45 2023 +0300

        Content dialog field, modalreturn redirect

    commit 00f8cc3
    Author: Fedik <getthesite@gmail.com>
    Date:   Sat Apr 15 16:44:09 2023 +0300

        Content dialog field, modalreturn and select on load

    commit 49b7fbe
    Author: Fedik <getthesite@gmail.com>
    Date:   Sat Apr 15 14:55:31 2023 +0300

        Content dialog field, modal toolbar

    commit bbd6da3
    Author: Fedik <getthesite@gmail.com>
    Date:   Sat Apr 15 14:13:38 2023 +0300

        Content dialog field, content select

    commit b155fc0
    Author: Fedik <getthesite@gmail.com>
    Date:   Sat Apr 15 13:40:26 2023 +0300

        Content dialog field, content select

    commit e6ac288
    Author: Fedik <getthesite@gmail.com>
    Date:   Fri Apr 14 19:15:05 2023 +0300

        Content dialog field, edit url

    commit 99beda2
    Author: Fedik <getthesite@gmail.com>
    Date:   Fri Apr 14 18:56:53 2023 +0300

        Content dialog field, view update

    commit e99794e
    Author: Fedik <getthesite@gmail.com>
    Date:   Fri Apr 14 18:39:51 2023 +0300

        Content dialog field, handle select

    commit 3a01472
    Author: Fedik <getthesite@gmail.com>
    Date:   Fri Apr 14 18:12:58 2023 +0300

        Content dialog field

    commit e1a0e18
    Author: Fedik <getthesite@gmail.com>
    Date:   Fri Apr 14 17:45:23 2023 +0300

        Content dialog field
@joomla-cms-bot joomla-cms-bot added NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.0-dev labels Sep 7, 2023
@Fedik Fedik added the Feature label Sep 7, 2023
@ceford
Copy link
Contributor

ceford commented Sep 7, 2023

I have tested this item ✅ successfully on cf30063


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/41629.

@HLeithner HLeithner merged commit 7657793 into joomla:5.0-dev Sep 12, 2023
3 of 4 checks passed
@Fedik Fedik deleted the popup-field-menu2 branch September 12, 2023 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.0-dev
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants