Skip to content

ブロックに関するプラグインのウィザードかどうかのフラグ追加 #319

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 1 commit into from
Aug 8, 2016
Merged

ブロックに関するプラグインのウィザードかどうかのフラグ追加 #319

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 20 additions & 8 deletions View/Helper/WizardHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,28 +175,40 @@ public function naviUrl($activeKey) {
/**
* ウィザードボタン
*
* @param string $activeKey アクティブのキー
* @param string $actKey アクティブのキー
* @param array $cancelOpt キャンセルボタンのオプション
* @param array $prevOpt 前へボタンのオプション
* @param array $nextOpt 次へ、決定ボタンのオプション
* @param array $isBlock ブロックに関するプラグインのウィザードかどうか
* @return string HTML
* @SuppressWarnings(PHPMD.BooleanArgumentFlag)
*/
public function buttons($activeKey, $cancelOpt = [], $prevOpt = [], $nextOpt = []) {
public function buttons($actKey, $cancelOpt = [], $prevOpt = [], $nextOpt = [], $isBlock = false) {
$output = '';

//ウィザードの状態取得
list($prev, $next) = $this->__wizardStep($activeKey);
list($prev, $next) = $this->__wizardStep($actKey);

//キャンセルボタン
$cancelUrl = NetCommonsUrl::actionUrlAsArray(
Hash::get($cancelOpt, 'url', $this->settings['cancelUrl'])
);
if ($isBlock) {
$cancelUrl = NetCommonsUrl::blockUrl(
Hash::get($cancelOpt, 'url', $this->settings['cancelUrl'])
);
} else {
$cancelUrl = NetCommonsUrl::actionUrlAsArray(
Hash::get($cancelOpt, 'url', $this->settings['cancelUrl'])
);
}
$cancelTitle = Hash::get($cancelOpt, 'title', __d('net_commons', 'Cancel'));
$output .= $this->Button->cancel($cancelTitle, $cancelUrl, $cancelOpt);

//前へボタン
if ($prev) {
$prevUrl = NetCommonsUrl::actionUrlAsArray(Hash::get($prevOpt, 'url', $prev['url']));
if ($isBlock) {
$prevUrl = NetCommonsUrl::blockUrl(Hash::get($prevOpt, 'url', $prev['url']));
} else {
$prevUrl = NetCommonsUrl::actionUrlAsArray(Hash::get($prevOpt, 'url', $prev['url']));
}
$prevlTitle = Hash::get($prevOpt, 'title', __d('net_commons', 'BACK'));
$prevOpt['icon'] = Hash::get($prevOpt, 'icon', 'chevron-left');
$output .= $this->Button->cancel($prevlTitle, $prevUrl, $prevOpt);
Expand Down Expand Up @@ -243,7 +255,7 @@ public function workflowButtons($statusName, $cancelUrl = null, $prevUrl = null,
$prevUrl = NetCommonsUrl::blockUrl($prev['url']);
}

$output .= $this->Workflow->buttons($statusName, $cancelUrl, $panel, $prevUrl);
$output .= $this->Workflow->buttons($statusName, $cancelUrl, $panel, $prevUrl, true);

return $output;
}
Expand Down