Can someone help me see what has happened/went wro...
# contributingt
TackleMcClean 🏅
05/30/2023, 12:59 PMCan someone help me see what has happened/went wrong in the merging of a PR I made previously for version 11.4.0?
Looking at the release notes here for 11.4.0 it supposedly has my fix:
https://our.umbraco.com/download/releases/1140
(thread)
TackleMcClean 🏅
05/30/2023, 1:00 PMTackleMcClean 🏅
05/30/2023, 1:01 PMThe pull request is here:
https://github.com/umbraco/Umbraco-CMS/pull/14127
TackleMcClean 🏅
05/30/2023, 1:02 PMIf you look at contentpicker.controller.js in the contrib branch you can see how entityResource.getByXPath is used, which is correct:
https://github.com/umbraco/Umbraco-CMS/blob/contrib/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js#L248
TackleMcClean 🏅
05/30/2023, 1:03 PMHowever, switching over to the
11.4.0TackleMcClean 🏅
05/30/2023, 1:03 PM(
getByQueryTackleMcClean 🏅
05/30/2023, 1:05 PMIs this a merging mishap somewhere? I can't tell if I have missed something in github or not.
@Sebastiaan any idea?
My gut tells me someone at Umbraco missed to do the actual merge, but we now have an officially resolved issue yet the actual code isn't there.
TackleMcClean 🏅
05/30/2023, 1:18 PM@Nikolaj Lauridsen Hi, I realize now I should've pinged you first - do you know if this has been correctly merged into 11.4.0?
n
Nikolaj Lauridsen
05/30/2023, 1:29 PMHmm just had a look at it, and it seems like it's not in there unfortunately
t
TackleMcClean 🏅
05/30/2023, 1:29 PM(I mentioned this right now on github in the PR but you can ignore that)
n
Nikolaj Lauridsen
05/30/2023, 1:29 PMI could have sworn I double checked and it was there, but I must have been mistaken, looks like it was merged after the RC so that's why it's not there
t
TackleMcClean 🏅
05/30/2023, 1:30 PMok cool, I feel good not being confused anymore 😄
TackleMcClean 🏅
05/30/2023, 1:30 PMthought I had maybe missed some build step before the commits or something
n
Nikolaj Lauridsen
05/30/2023, 1:31 PMYeah that one's on me, we had some lables that neede to be swapped since there won't be an 11.3.2 release, and I've goofed on some of them it seems
t
TackleMcClean 🏅
05/30/2023, 1:32 PMDo you know what happens to the issue from now? Does it join in on the next release?
And if so, do you know roughly when that is/which version?
n
Nikolaj Lauridsen
05/30/2023, 1:35 PMYeah it'll be there for the next release, don't have a timeline though
Nikolaj Lauridsen
05/30/2023, 1:36 PMThe versions are on the PR as labels 🙂 so 10.6, 11.4.1, and 12.0.0
t
TackleMcClean 🏅
05/30/2023, 1:37 PM👍 thank you