Skip to content

Commit

Permalink
ファイル名変更
Browse files Browse the repository at this point in the history
  • Loading branch information
@NEKOGET
NEKOGET committed Apr 24, 2014
1 parent 0e83753 commit 4a092ee
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 67 deletions.
32 changes: 16 additions & 16 deletions Controller/SiteController.php → Controller/ThemeSiteController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @link http://www.netcommons.org NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
*/
class SiteController extends AppController {
class ThemeSiteController extends AppController {

/**
* helper
Expand All @@ -23,10 +23,10 @@ class SiteController extends AppController {
public $SiteTheme = null;

/**
* SiteThemeValue model class格納用
* ThemeSiteValue model class格納用
* @var null
*/
public $SiteThemeValue = null;
public $ThemeSiteValue = null;

/**
* beforeFilter
Expand All @@ -37,9 +37,9 @@ class SiteController extends AppController {
public function beforeFilter() {
parent::beforeFilter();
$this->Auth->allow();
$this->set("classUrl", "site");
$this->SiteTheme = Classregistry::init("Theme.SiteTheme");
$this->SiteThemeValue = Classregistry::init("Theme.SiteThemeValue");
$this->set("classUrl", "theme_site");
$this->ThemeSite = Classregistry::init("Theme.ThemeSite");
$this->ThemeSiteValue = Classregistry::init("Theme.ThemeSiteValue");
}

/**
Expand Down Expand Up @@ -73,19 +73,19 @@ public function confirm($theme = "default") {
}
//Postのとき
if ($this->request->isPost()) {
$ck = $this->SiteTheme->updateTheme($this->request->data);
$ck = $this->ThemeSite->updateTheme($this->request->data);
if ($ck) {
//完了画面表示 //成功した場合
$this->theme = $this->SiteTheme->getThemeName();
$this->theme = $this->ThemeSite->getThemeName();
$this->set('themeList', $this->getThemeList()); //テーマ一覧を取得する
$this->set("confirm", false); //確認モーダル表示 ON
$this->view = "update_end"; //完了画面表示
return $this->render();
} else {
//バリデーションエラー
if (isset($this->SiteTheme->validationErrors) && $this->SiteTheme->validationErrors) {
$errors = $this->SiteTheme->validationErrors;
$this->set("errors", $errors["SiteThemeValue"]["value"]);
if (isset($this->ThemeSite->validationErrors) && $this->ThemeSite->validationErrors) {
$errors = $this->ThemeSite->validationErrors;
$this->set("errors", $errors["ThemeSiteValue"]["value"]);
$this->view = "index";
return $this->index();
} else {
Expand All @@ -98,7 +98,7 @@ public function confirm($theme = "default") {
$this->view = "index";
$this->theme = $theme;
$themeList = $this->getThemeList();
$oldTheme = $this->SiteTheme->getTheme();
$oldTheme = $this->ThemeSite->getTheme();
$this->set("oldTheme", $oldTheme);
$this->set('themeList', $themeList); //テーマ一覧を取得する
$this->set("themeInfo", $themeList[$theme]);
Expand All @@ -118,7 +118,7 @@ private function __confirmForm($theme) {
$this->view = "index";
$this->theme = $theme;
$themeList = $this->getThemeList();
$oldTheme = $this->SiteTheme->getTheme();
$oldTheme = $this->ThemeSite->getTheme();
$this->set("confirm", true); //モーダル表示ON
$this->set("oldTheme", $oldTheme);
$this->set('themeList', $themeList); //テーマ一覧を取得する
Expand Down Expand Up @@ -164,9 +164,9 @@ public function getThemeList() {
* @author Takako Miyagawa <nekoget@gmail.com>
*/
public function setting($theme = "Defalut") {
$siteTheme = Classregistry::init("Theme.SiteTheme");
$siteTheme->updateTheme($theme);//更新
$this->theme = $siteTheme->getThemeName();
$ThemeSite = Classregistry::init("Theme.ThemeSite");
$ThemeSite->updateTheme($theme);//更新
$this->theme = $ThemeSite->getThemeName();
$this->set('themeList', $this->getThemeList()); //テーマ一覧を取得する
$this->set("confirm", false); //確認モーダル表示 ON
}
Expand Down
35 changes: 17 additions & 18 deletions Model/SiteTheme.php → Model/ThemeSite.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

App::uses('AppModel', 'Model');

class SiteTheme extends AppModel {
class ThemeSite extends AppModel {

/**
* テーブルの指定
* @var bool
*/
public $useTable = 'site_settings';

public $name = "SiteTheme";
public $name = "ThemeSite";

public $hasOne = array(
'SiteThemeValue' => array(
'ClassName' => 'SiteThemeValue',
'confitions' => array("SiteThemeValue.id" => "SiteTheme.id"),
'ThemeSiteValue' => array(
'ClassName' => 'ThemeSiteValue',
'confitions' => array("ThemeSiteValue.id" => "ThemeSite.id"),
'dependent' => true
)
);
Expand Down Expand Up @@ -45,25 +45,24 @@ public function updateTheme($theme) {
if (is_array($theme)) {
$updateData = $theme;
} elseif (is_string($theme)) {
$updateData['SiteThemeValue']['value'] = $theme;
$updateData["ThemeSiteValue"]["value"] = $theme;
}
//旧データの存在を確認
$ck = $this->find('first', array(
'conditions' => array('name' => "Theme")
));

if ($ck
&& isset($ck['SiteTheme'])
&& isset($ck['SiteTheme']['id'])
&& isset($ck['ThemeSite'])
&& isset($ck['ThemeSite']['id'])
) {
//データの更新
$updateData['SiteTheme']['name'] = 'Theme';
$updateData['SiteTheme']['id'] = $ck['SiteTheme']['id'];
$updateData['SiteThemeValue']['id'] = $ck['SiteThemeValue']['id'];
$updateData['ThemeSite']['name'] = 'Theme';
$updateData['ThemeSite']['id'] = $ck['ThemeSite']['id'];
$updateData['ThemeSiteValue']['id'] = $ck['ThemeSiteValue']['id'];
return $this->saveAssociated($updateData);
} else {
//データの保存 insert
$updateData['SiteTheme']['name'] = 'Theme';
$updateData['ThemeSite']['name'] = 'Theme';
return $this->saveAssociated($updateData);
}
}
Expand All @@ -74,11 +73,11 @@ public function updateTheme($theme) {
*/
public function getThemeName() {
$theme = $this->getTheme();
if ($theme && isset($theme["SiteThemeValue"])
&& isset($theme["SiteThemeValue"]["value"])
&& $theme["SiteThemeValue"]["value"]
if ($theme && isset($theme["ThemeSiteValue"])
&& isset($theme["ThemeSiteValue"]["value"])
&& $theme["ThemeSiteValue"]["value"]
) {
return $theme["SiteThemeValue"]["value"];
return $theme["ThemeSiteValue"]["value"];
}
return null;
}
Expand All @@ -89,7 +88,7 @@ public function getThemeName() {
*/
public function getTheme() {
$theme = $this->find('first', array(
'conditions' => array('SiteTheme.name' => "Theme")
'conditions' => array('ThemeSite.name' => "Theme")
));
if ($theme) {
return $theme;
Expand Down
4 changes: 2 additions & 2 deletions Model/SiteThemeValue.php → Model/ThemeSiteValue.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
/**
* Summary for SiteSettingValue Model
*/
class SiteThemeValue extends AppModel {
class ThemeSiteValue extends AppModel {

/**
* テーブルの指定
* @var bool
*/
public $useTable = 'site_setting_values';

public $name = "SiteThemeValue";
public $name = "ThemeSiteValue";

/**
* __construct
Expand Down
48 changes: 24 additions & 24 deletions Test/Case/Model/SiteThemeTest.php → Test/Case/Model/ThemeSiteTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ class SiteThemeTest extends CakeTestCase {
*/
public function setUp() {
parent::setUp();
$this->SiteTheme = ClassRegistry::init('Theme.SiteTheme');
$this->SiteThemeValue = ClassRegistry::init('Theme.SiteThemeValue');
$this->ThemeSite = ClassRegistry::init('Theme.ThemeSite');
$this->ThemeSiteValue = ClassRegistry::init('Theme.ThemeSiteValue');
}

/**
Expand All @@ -46,23 +46,23 @@ public function setUp() {
* @return void
*/
public function tearDown() {
unset($this->SiteTheme);
unset($this->SiteThemeValue);
unset($this->ThemeSite);
unset($this->ThemeSiteValue);
parent::tearDown();
}
/**
* getSiteTheme サイト用テーマ名の取得
* getThemeSite サイト用テーマ名の取得
* @return void
*/
public function testGetThemeName() {
//データがある場合
$ck = $this->SiteTheme->getThemeName();
$ck = $this->ThemeSite->getThemeName();
$this->assertTextEquals("UnitTestTheme", $ck);
//データが無い場合を作る
$ck = $this->SiteTheme->delete(2);
$ck = $this->ThemeSite->delete(2);
$this->assertTrue($ck);
//問い合わせた結果データは無いのでnullが戻る
$ck = $this->SiteTheme->getThemeName();
$ck = $this->ThemeSite->getThemeName();
$this->assertEquals(null, $ck);
}

Expand All @@ -72,51 +72,51 @@ public function testGetThemeName() {
*/
public function testGetTheme() {
//データがある場合
$ck = $this->SiteTheme->getTheme();
$ck = $this->ThemeSite->getTheme();
//var_dump($ck);
$this->assertTextEquals("UnitTestTheme", $ck['SiteThemeValue']['value']);
$this->assertTextEquals("UnitTestTheme", $ck['ThemeSiteValue']['value']);
//データを削除
$ck = $this->SiteTheme->delete(2);
$ck = $this->ThemeSite->delete(2);
$this->assertTrue($ck);
//データが無い状態
$ck = $this->SiteTheme->getTheme();
$ck = $this->ThemeSite->getTheme();
$this->assertNull($ck);
}

public function testUpdateTheme() {
$theme = 'Default';
$ck = $this->SiteTheme->updateTheme($theme);
$ck = $this->ThemeSite->updateTheme($theme);
$this->assertTrue($ck);
//名前を確認する
$ck = $this->SiteTheme->getThemeName();
$ck = $this->ThemeSite->getThemeName();
$this->assertTextEquals($theme, $ck);
//配列の場合
$theme2['SiteThemeValue']['value'] = "test2";
$ck = $this->SiteTheme->updateTheme($theme2);
$theme2['ThemeSiteValue']['value'] = "test2";
$ck = $this->ThemeSite->updateTheme($theme2);
$this->assertTrue($ck);
//名前を確認する
$ck = $this->SiteTheme->getThemeName();
$ck = $this->ThemeSite->getThemeName();
$this->assertTextEquals("test2", $ck);
//valueがブランク
$theme2['SiteThemeValue']['value'] = "";
$ck = $this->SiteTheme->updateTheme($theme2);
$theme2['ThemeSiteValue']['value'] = "";
$ck = $this->ThemeSite->updateTheme($theme2);
//$this->assertTrue(!$ck);
}

public function testCreateTheme() {
//データが無い場合を作る
$ck = $this->SiteTheme->delete(2);
$ck = $this->ThemeSite->delete(2);
$this->assertTrue($ck);
//問い合わせた結果データは無いのでnullが戻る
$ck = $this->SiteTheme->getThemeName();
$ck = $this->ThemeSite->getThemeName();
$this->assertEquals(null, $ck);
//テーマを設定する
$theme = 'Default';
$ck = $this->SiteTheme->updateTheme($theme);
$ck = $this->ThemeSite->updateTheme($theme);
$this->assertTrue($ck);
//名前を確認する
$ck = $this->SiteTheme->getThemeName();
$ck = $this->ThemeSite->getThemeName();
$this->assertTextEquals($theme, $ck);
//var_dump($this->SiteTheme->find('all'));
//var_dump($this->ThemeSite->find('all'));
}
}
12 changes: 6 additions & 6 deletions Test/Case/Model/SiteThemeValueTest.php → Test/Case/Model/ThemeSiteValueTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class SiteThemeValueTest extends CakeTestCase {
'site_setting_value'
);

public $SiteTheme;
public $ThemeSite;

/**
* setUp method
Expand All @@ -36,8 +36,8 @@ class SiteThemeValueTest extends CakeTestCase {
*/
public function setUp() {
parent::setUp();
$this->SiteTheme = ClassRegistry::init('Theme.SiteTheme');
$this->SiteThemeValue = ClassRegistry::init('Theme.SiteThemeValue');
$this->ThemeSite = ClassRegistry::init('Theme.ThemeSite');
$this->ThemeSiteValue = ClassRegistry::init('Theme.ThemeSiteValue');
}

/**
Expand All @@ -46,12 +46,12 @@ public function setUp() {
* @return void
*/
public function tearDown() {
unset($this->SiteTheme);
unset($this->SiteThemeValue);
unset($this->ThemeSite);
unset($this->ThemeSiteValue);
parent::tearDown();
}

public function testSave() {
$this->assertFalse($this->SiteThemeValue->save(array()));
$this->assertFalse($this->ThemeSiteValue->save(array()));
}
}
2 changes: 1 addition & 1 deletion View/Site/index.ctp → View/ThemeSite/index.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<?php //TODO:POST ?>
<a href="javascript:void(0)" id="btnSiteThemePost" class="btn btn-primary" role="button"><?php echo __('設定する')?></a>
<?php echo $this->Form->create(null, array("id"=>"SiteThemePost")); ?>
<?php echo $this->Form->input("SiteThemeValue.value" , array(
<?php echo $this->Form->input("ThemeSiteValue.value" , array(
"type"=>"hidden",
//"name" => "data[value]",
"value" => h($targetTheme)
Expand Down
0 View/Site/update_end.ctp → View/ThemeSite/update_end.ctp
View file
File renamed without changes.

0 comments on commit 4a092ee

Please sign in to comment.