Skip to content

不用意にHashを使用している箇所を使用しないように修正 #63

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
ohga21 merged 1 commit into from
Sep 4, 2018
Merged

不用意にHashを使用している箇所を使用しないように修正 #63

Show file tree
Hide file tree
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
38 changes: 14 additions & 24 deletions Controller/AccessCountersController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,23 +119,17 @@ public function add() {
} else {
//初期データセット
//--AccessCounter
$this->request->data = Hash::merge(
$this->request->data,
$this->AccessCounter->createAll(array(
'AccessCounter' => array(
'id' => null,
),
'BlocksLanguage' => array(
'language_id' => Current::read('Language.id'),
'name' => __d('access_counters', 'New Counter %s', date('YmdHis')),
),
))
);
$this->request->data += $this->AccessCounter->createAll([
'AccessCounter' => [
'id' => null,
],
'BlocksLanguage' => [
'language_id' => Current::read('Language.id'),
'name' => __d('access_counters', 'New Counter %s', date('YmdHis')),
],
]);
//--AccessCounterFrameSetting
$this->request->data = Hash::merge(
$this->request->data,
$this->AccessCounterFrameSetting->getAccessCounterFrameSetting(true)
);
$this->request->data += $this->AccessCounterFrameSetting->getAccessCounterFrameSetting(true);
//--Frame
$this->request->data['Frame'] = Current::read('Frame');
}
Expand Down Expand Up @@ -163,9 +157,7 @@ public function edit() {

} else {
//--Block
$this->request->data['Block'] = Current::read('Block');
$this->request->data['BlocksLanguage'] = Current::read('BlocksLanguage');
if (! $this->request->data['Block']['key']) {
if (! Current::read('Block.key')) {
$this->throwBadRequest();
return false;
}
Expand All @@ -174,13 +166,11 @@ public function edit() {
$this->throwBadRequest();
return false;
}
$this->request->data = Hash::merge($this->request->data, $accessCounter);
$this->request->data += $accessCounter;
//--AccessCounterFrameSetting
$this->request->data = Hash::merge(
$this->request->data,
$this->AccessCounterFrameSetting->getAccessCounterFrameSetting(true)
);
$this->request->data += $this->AccessCounterFrameSetting->getAccessCounterFrameSetting(true);
//--Frame
$this->request->data['BlocksLanguage'] = Current::read('BlocksLanguage');
$this->request->data['Frame'] = Current::read('Frame');
}
}
Expand Down
8 changes: 4 additions & 4 deletions Model/AccessCounter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class AccessCounter extends AccessCountersAppModel {
* @see Model::save()
*/
public function beforeValidate($options = array()) {
$this->validate = Hash::merge($this->validate, array(
$this->validate = array_merge($this->validate, array(
'block_key' => array(
'notBlank' => array(
'rule' => array('notBlank'),
Expand Down Expand Up @@ -197,16 +197,16 @@ public function validateAccessCounter($data) {

$this->BlocksLanguage->set($data);
if (! $this->BlocksLanguage->validates()) {
$this->validationErrors = Hash::merge(
$this->validationErrors = array_merge(
$this->validationErrors, $this->BlocksLanguage->validationErrors
);
return false;
}
$this->data = Hash::merge($this->data, $this->BlocksLanguage->data);
$this->data = $this->data + $this->BlocksLanguage->data;

$this->AccessCounterFrameSetting->set($data);
if (! $this->AccessCounterFrameSetting->validates()) {
$this->validationErrors = Hash::merge(
$this->validationErrors = array_merge(
$this->validationErrors, $this->AccessCounterFrameSetting->validationErrors
);
return false;
Expand Down
2 changes: 1 addition & 1 deletion Model/AccessCounterFrameSetting.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class AccessCounterFrameSetting extends AccessCountersAppModel {
public function beforeValidate($options = array()) {
$displayTypes = array_keys(self::$displayTypes);

$this->validate = Hash::merge($this->validate, array(
$this->validate = array_merge($this->validate, array(
'frame_key' => array(
'notBlank' => array(
'rule' => array('notBlank'),
Expand Down