Skip to content

ソートフラグを追加 #90

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 2 commits into from
Jun 13, 2016
Merged

ソートフラグを追加 #90

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57e7173
ソートフラグを追加
s-nakajima Jun 13, 2016
7031244
ルーム管理のUnitテストでエラー発生
s-nakajima Jun 13, 2016
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
21 changes: 15 additions & 6 deletions View/Helper/UserSearchHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,20 @@ public function __construct(View $View, $settings = array()) {
$this->UsersLanguage = ClassRegistry::init('Users.UsersLanguage');

$this->userAttributes = Hash::combine(
$this->_View->viewVars['userAttributes'], '{n}.{n}.{n}.UserAttribute.key', '{n}.{n}.{n}'
Hash::get($this->_View->viewVars, 'userAttributes', array()),
'{n}.{n}.{n}.UserAttribute.key', '{n}.{n}.{n}'
);
}

/**
* テーブルヘッダーの出力
*
* @param bool $isEdit 編集の有無
* @param bool $isSort ソートの有無
* @return string User value
* @SuppressWarnings(PHPMD.BooleanArgumentFlag)
*/
public function tableHeaders($isEdit = false) {
public function tableHeaders($isEdit = false, $isSort = true) {
$output = '';

foreach ($this->_View->viewVars['displayFields'] as $fieldName) {
Expand All @@ -81,15 +83,22 @@ public function tableHeaders($isEdit = false) {

$output .= '<th' . $class . '>';
if ($fieldName === 'room_role_key') {
$output .= $this->_View->Paginator->sort('RoomRole.level', __d('rooms', 'Room role'));
$label = __d('rooms', 'Room role');
$key = 'RoomRole.level';
} else {
$userAttribute = Hash::extract(
$this->userAttributes, '{s}.UserAttribute[key=' . $fieldName . ']'
);
$output .= $this->_View->Paginator->sort(
$this->User->getOriginalUserField($fieldName), $userAttribute[0]['name']
);
$label = $userAttribute[0]['name'];
$key = $this->User->getOriginalUserField($fieldName);
}

if ($isSort) {
$output .= $this->_View->Paginator->sort($key, $label);
} else {
$output .= h($label);
}

$output .= '</th>';

if ($isEdit) {
Expand Down