Skip to content
This repository has been archived by the owner on Nov 14, 2018. It is now read-only.

Added action dependency after all actions have been cleaned initially. #51

Merged
merged 1 commit into from
Nov 20, 2012
Merged
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions Admin/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -511,12 +511,17 @@ private function initializeActions()
}
$action->setAdmin($this);
$action->setContainer($this->container);

$actions[$action->getFullName()] = $action;
}

// Check dependencies
foreach ($actions as $action)
{
foreach ($action->getActionDependences() as $actionName => $options) {
$dependenceAction = $this->findAction($actions, $actionName);
$dependenceAction->mergeOptions($options);
}

$actions[$action->getFullName()] = $action;
}

// action parsers
Expand Down