Skip to content

Use Attribute instead of Annotation to define route. Add pimcore_admin_element_islocked #1014

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

Merged
merged 5 commits into from
Oct 10, 2025
+24 −19
Merged

Use Attribute instead of Annotation to define route. Add pimcore_admin_element_islocked #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1bae7d8
Use Attribute instead of Annotation to define route. Actually define …
muratbinerbay Sep 30, 2025
b6e3f10
Refresh the current object instead of closing and opening it
muratbinerbay Sep 30, 2025
5d31251
Try calling reload() instead of refresh()
muratbinerbay Sep 30, 2025
8ebaaa4
keep to former logic with early return to skip admin index _dc
kingjia90 Oct 10, 2025
5b754cb
Fix indentation in helpers.js
kingjia90 Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 22 additions & 15 deletions public/js/pimcore/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,25 @@ pimcore.helpers.closeElement = function (id, type) {
}
};

pimcore.helpers.refreshElement = function () {
var tabpanel = Ext.getCmp("pimcore_panel_tabs");
var activeTab = tabpanel.getActiveTab();

if (activeTab) {
// for document
if (activeTab.initialConfig.document) {
activeTab.initialConfig.document.reload();
return true;
}
else if (activeTab.initialConfig.object) {
activeTab.initialConfig.object.reload();
return true;
}
}

return false;
};

pimcore.helpers.getElementTypeByObject = function (object) {
var type = null;
if (object instanceof pimcore.document.document) {
Expand Down Expand Up @@ -723,19 +742,8 @@ pimcore.helpers.handleF5 = function (keyCode, e) {

e.stopEvent();

var tabpanel = Ext.getCmp("pimcore_panel_tabs");
var activeTab = tabpanel.getActiveTab();

if (activeTab) {
// for document
if (activeTab.initialConfig.document) {
activeTab.initialConfig.document.reload();
return;
}
else if (activeTab.initialConfig.object) {
activeTab.initialConfig.object.reload();
return;
}
if (pimcore.helpers.refreshElement()){
return;
}

var date = new Date();
Expand Down Expand Up @@ -766,8 +774,7 @@ pimcore.helpers.lockManager = function (cid, ctype, csubtype, data) {
}
});
} else {
pimcore.helpers.closeElement(lock[0], lock[1]);
pimcore.helpers.openElement(lock[0], lock[1], lock[2]);
pimcore.helpers.refreshElement();
}
}.bind(this, arguments));
};
Expand Down
6 changes: 2 additions & 4 deletions src/Controller/Admin/ElementController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class ElementController extends AdminAbstractController
{
use ElementEditLockHelperTrait;

#[Route('/element/lock-element', name: 'pimcore_admin_element_lockelement', methods: ['PUT'])]
#[Route('/element/lock-element', name: 'pimcore_admin_element_islocked', methods: ['GET'])]
public function isLockedAction(Request $request): JsonResponse
{
$isLocked = Element\Editlock::isLocked(
Expand All @@ -56,9 +56,7 @@ public function isLockedAction(Request $request): JsonResponse
return $this->adminJson(['success' => true, 'editLock' => null]);
}

/**
* @Route("/element/lock-element", name="pimcore_admin_element_lockelement", methods={"PUT"})
*/
#[Route('/element/lock-element', name: 'pimcore_admin_element_lockelement', methods:['PUT'])]
public function lockElementAction(Request $request): Response
{
Element\Editlock::lock($request->request->getInt('id'), $request->request->get('type'), $request->getSession()->getId());
Expand Down