diff --git a/include/application.php b/include/application.php index 1622c97..5ae587c 100644 --- a/include/application.php +++ b/include/application.php @@ -939,6 +939,11 @@ class Application { return $oTable->GetString(); } + public function objectGetClassDisplayName() + { + return 'application'; + } + public function objectMakeUrl() { $sUrl = APPDB_ROOT."objectManager.php?sClass=application&iId=$this->iAppId"; diff --git a/include/objectManager.php b/include/objectManager.php index e7df527..2b23921 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -912,8 +912,13 @@ class ObjectManager return FALSE; } + $oParent = $oObject->objectGetParent(); + $oParentOM = new objectManager(get_class($oParent), '', $oParent->objectGetId()); + + $sClassDisplayName = $oParentOM->GetOptionalSetting('objectGetClassDisplayName', 'parent entry'); + /* Display some help text */ - echo "

Move ".$oObject->objectMakeLink()." to the parent entry "; + echo "

Move ".$oObject->objectMakeLink()." to the $sClassDisplayName "; echo "selected below:

\n"; echo "\n"; @@ -922,16 +927,12 @@ class ObjectManager "Move here"), "color4"); - $oParent = $oObject->objectGetParent(); - if(method_exists($oParent, 'objectGetParent')) { $oGrandFather = $oParent->objectGetParent(); - $oParentOM = new objectManager(get_class($oParent), '', $oParent->objectGetId()); } else { $oGrandFather = null; - $oParentOM = null; } if($oGrandFather && $oParentOM->GetOptionalSetting('objectRestrictMoveObjectListsToParents', false)) @@ -1149,13 +1150,23 @@ class ObjectManager exit; } - private function displayChangeParent($oObject, $sLinkText = 'Move to another parent entry') + private function displayChangeParent($oObject, $sLinkText = 'default') { /* Display a link to the move child objects page if the class has the necessary functions and the user has edit rights. Not all classes have child objects. */ if(method_exists($oObject, "objectSetParent") && method_exists($oObject, "objectGetId") && $oObject->canEdit()) { + if($sLinkText == 'default') + { + $oParent = $oObject->objectGetParent(); + $oParentOM = new objectManager(get_class($oParent), '', $oParent->objectGetId()); + $sClassName = $oParentOM->getOptionalSetting('objectGetClassDisplayName', false); + if($sClassName) + $sLinkText = "Move to another $sClassName"; + else + $sLinkText = 'Move to another parent entry'; + } echo "makeUrl("showChangeParent", $this->iId, "Move to another parent entry")."\">$sLinkText\n"; } diff --git a/include/vendor.php b/include/vendor.php index f9dfcf5..f70bd8b 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -398,6 +398,11 @@ class Vendor { } } + public function objectGetClassDisplayName() + { + return 'developer'; + } + /* Make a URL for viewing the specified vendor */ function objectMakeUrl() { diff --git a/include/version.php b/include/version.php index 9f81501..055a530 100644 --- a/include/version.php +++ b/include/version.php @@ -1447,6 +1447,11 @@ class version { return FALSE; } + public function objectGetClassDisplayName() + { + return 'version'; + } + public function objectMakeUrl() { return APPDB_ROOT."objectManager.php?sClass=version&iId=$this->iVersionId";