From 7572a39282251c6f9358dabf72a91db581ce4bbb Mon Sep 17 00:00:00 2001 From: root Date: Sat, 30 Aug 2014 02:01:31 +0000 Subject: [PATCH 01/53] LinkLisrename LinkLists to Links --- Controller/LinkListsController.php | 117 ----------------- ...pController.php => LinksAppController.php} | 2 +- ...ller.php => LinksCategoriesController.php} | 58 ++++----- Controller/LinksController.php | 118 ++++++++++++++++++ Model/{Linklist.php => Link.php} | 36 +++--- ...istPartSetting.php => LinkPartSetting.php} | 24 ++-- .../{LinklistSetting.php => LinkSetting.php} | 24 ++-- ...inkListsAppModel.php => LinksAppModel.php} | 2 +- Model/{LinklistsBlock.php => LinksBlock.php} | 30 ++--- ...inklistsCategory.php => LinksCategory.php} | 32 ++--- ....php => LinksCategoriesControllerTest.php} | 20 +-- ...rollerTest.php => LinksControllerTest.php} | 20 +-- Test/Case/Model/LinkPartSettingTest.php | 51 ++++++++ Test/Case/Model/LinkSettingTest.php | 48 +++++++ Test/Case/Model/LinkTest.php | 52 ++++++++ Test/Case/Model/LinklistPartSettingTest.php | 51 -------- Test/Case/Model/LinklistSettingTest.php | 48 ------- Test/Case/Model/LinklistTest.php | 52 -------- Test/Case/Model/LinklistsBlockTest.php | 52 -------- Test/Case/Model/LinklistsCategoryTest.php | 50 -------- Test/Case/Model/LinksBlockTest.php | 52 ++++++++ Test/Case/Model/LinksCategoryTest.php | 50 ++++++++ .../{LinklistFixture.php => LinkFixture.php} | 20 +-- ...Fixture.php => LinkPartSettingFixture.php} | 16 +-- ...tingFixture.php => LinkSettingFixture.php} | 16 +-- ...BlockFixture.php => LinksBlockFixture.php} | 12 +- ...ryFixture.php => LinksCategoryFixture.php} | 16 +-- 27 files changed, 535 insertions(+), 534 deletions(-) delete mode 100644 Controller/LinkListsController.php rename Controller/{LinkListsAppController.php => LinksAppController.php} (50%) rename Controller/{LinkListsCategoriesController.php => LinksCategoriesController.php} (52%) create mode 100644 Controller/LinksController.php rename Model/{Linklist.php => Link.php} (78%) rename Model/{LinklistPartSetting.php => LinkPartSetting.php} (83%) rename Model/{LinklistSetting.php => LinkSetting.php} (59%) rename Model/{LinkListsAppModel.php => LinksAppModel.php} (50%) rename Model/{LinklistsBlock.php => LinksBlock.php} (68%) rename Model/{LinklistsCategory.php => LinksCategory.php} (77%) rename Test/Case/Controller/{LinkListsCategoriesControllerTest.php => LinksCategoriesControllerTest.php} (53%) rename Test/Case/Controller/{LinkListsControllerTest.php => LinksControllerTest.php} (58%) create mode 100644 Test/Case/Model/LinkPartSettingTest.php create mode 100644 Test/Case/Model/LinkSettingTest.php create mode 100644 Test/Case/Model/LinkTest.php delete mode 100644 Test/Case/Model/LinklistPartSettingTest.php delete mode 100644 Test/Case/Model/LinklistSettingTest.php delete mode 100644 Test/Case/Model/LinklistTest.php delete mode 100644 Test/Case/Model/LinklistsBlockTest.php delete mode 100644 Test/Case/Model/LinklistsCategoryTest.php create mode 100644 Test/Case/Model/LinksBlockTest.php create mode 100644 Test/Case/Model/LinksCategoryTest.php rename Test/Fixture/{LinklistFixture.php => LinkFixture.php} (81%) rename Test/Fixture/{LinklistPartSettingFixture.php => LinkPartSettingFixture.php} (77%) rename Test/Fixture/{LinklistSettingFixture.php => LinkSettingFixture.php} (69%) rename Test/Fixture/{LinklistsBlockFixture.php => LinksBlockFixture.php} (77%) rename Test/Fixture/{LinklistsCategoryFixture.php => LinksCategoryFixture.php} (79%) diff --git a/Controller/LinkListsController.php b/Controller/LinkListsController.php deleted file mode 100644 index fc5b237..0000000 --- a/Controller/LinkListsController.php +++ /dev/null @@ -1,117 +0,0 @@ - -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License - */ -class LinkListsController extends LinkListsAppController { - -/** - * Components - * - * @var array - */ - public $components = array('Paginator'); - -/** - * index method - * - * @return void - */ - public function index() { - $this->LinkList->recursive = 0; - $this->set('linkLists', $this->Paginator->paginate()); - } - -/** - * view method - * - * @throws NotFoundException - * @param string $id - * @return void - */ - public function view($id = null) { - if (!$this->LinkList->exists($id)) { - throw new NotFoundException(__('Invalid link list')); - } - $options = array('conditions' => array('LinkList.' . $this->LinkList->primaryKey => $id)); - $this->set('linkList', $this->LinkList->find('first', $options)); - } - -/** - * add method - * - * @return void - */ - public function add() { - if ($this->request->is('post')) { - $this->LinkList->create(); - if ($this->LinkList->save($this->request->data)) { - $this->Session->setFlash(__('The link list has been saved.')); - return $this->redirect(array('action' => 'index')); - } else { - $this->Session->setFlash(__('The link list could not be saved. Please, try again.')); - } - } - $linklistsBlocks = $this->LinkList->LinklistsBlock->find('list'); - $languages = $this->LinkList->Language->find('list'); - $linklistsCategories = $this->LinkList->LinklistsCategory->find('list'); - $blocks = $this->LinkList->Block->find('list'); - $this->set(compact('linklistsBlocks', 'languages', 'linklistsCategories', 'blocks')); - } - -/** - * edit method - * - * @throws NotFoundException - * @param string $id - * @return void - */ - public function edit($id = null) { - if (!$this->LinkList->exists($id)) { - throw new NotFoundException(__('Invalid link list')); - } - if ($this->request->is(array('post', 'put'))) { - if ($this->LinkList->save($this->request->data)) { - $this->Session->setFlash(__('The link list has been saved.')); - return $this->redirect(array('action' => 'index')); - } else { - $this->Session->setFlash(__('The link list could not be saved. Please, try again.')); - } - } else { - $options = array('conditions' => array('LinkList.' . $this->LinkList->primaryKey => $id)); - $this->request->data = $this->LinkList->find('first', $options); - } - $linklistsBlocks = $this->LinkList->LinklistsBlock->find('list'); - $languages = $this->LinkList->Language->find('list'); - $linklistsCategories = $this->LinkList->LinklistsCategory->find('list'); - $blocks = $this->LinkList->Block->find('list'); - $this->set(compact('linklistsBlocks', 'languages', 'linklistsCategories', 'blocks')); - } - -/** - * delete method - * - * @throws NotFoundException - * @param string $id - * @return void - */ - public function delete($id = null) { - $this->LinkList->id = $id; - if (!$this->LinkList->exists()) { - throw new NotFoundException(__('Invalid link list')); - } - $this->request->onlyAllow('post', 'delete'); - if ($this->LinkList->delete()) { - $this->Session->setFlash(__('The link list has been deleted.')); - } else { - $this->Session->setFlash(__('The link list could not be deleted. Please, try again.')); - } - return $this->redirect(array('action' => 'index')); - }} diff --git a/Controller/LinkListsAppController.php b/Controller/LinksAppController.php similarity index 50% rename from Controller/LinkListsAppController.php rename to Controller/LinksAppController.php index 1a01fb3..3affb42 100644 --- a/Controller/LinkListsAppController.php +++ b/Controller/LinksAppController.php @@ -2,6 +2,6 @@ App::uses('AppController', 'Controller'); -class LinkListsAppController extends AppController { +class LinksAppController extends AppController { } diff --git a/Controller/LinkListsCategoriesController.php b/Controller/LinksCategoriesController.php similarity index 52% rename from Controller/LinkListsCategoriesController.php rename to Controller/LinksCategoriesController.php index 530e17a..4bac63a 100644 --- a/Controller/LinkListsCategoriesController.php +++ b/Controller/LinksCategoriesController.php @@ -1,16 +1,16 @@ -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License + * @author Ryuji AMANO + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License */ -class LinkListsCategoriesController extends LinkListsAppController { +class LinksCategoriesController extends LinksAppController { /** * Components @@ -25,23 +25,23 @@ class LinkListsCategoriesController extends LinkListsAppController { * @return void */ public function index() { - $this->LinkListsCategory->recursive = 0; + $this->LinksCategory->recursive = 0; $this->set('linkListsCategories', $this->Paginator->paginate()); } /** * view method * + * @param string $id 仮 * @throws NotFoundException - * @param string $id * @return void */ public function view($id = null) { - if (!$this->LinkListsCategory->exists($id)) { + if (!$this->LinksCategory->exists($id)) { throw new NotFoundException(__('Invalid link lists category')); } - $options = array('conditions' => array('LinkListsCategory.' . $this->LinkListsCategory->primaryKey => $id)); - $this->set('linkListsCategory', $this->LinkListsCategory->find('first', $options)); + $options = array('conditions' => array('LinksCategory.' . $this->LinksCategory->primaryKey => $id)); + $this->set('linkListsCategory', $this->LinksCategory->find('first', $options)); } /** @@ -51,60 +51,60 @@ public function view($id = null) { */ public function add() { if ($this->request->is('post')) { - $this->LinkListsCategory->create(); - if ($this->LinkListsCategory->save($this->request->data)) { + $this->LinksCategory->create(); + if ($this->LinksCategory->save($this->request->data)) { $this->Session->setFlash(__('The link lists category has been saved.')); return $this->redirect(array('action' => 'index')); } else { $this->Session->setFlash(__('The link lists category could not be saved. Please, try again.')); } } - $linklistsBlocks = $this->LinkListsCategory->LinklistsBlock->find('list'); - $languages = $this->LinkListsCategory->Language->find('list'); - $this->set(compact('linklistsBlocks', 'languages')); + $linksBlocks = $this->LinksCategory->LinksBlock->find('list'); + $languages = $this->LinksCategory->Language->find('list'); + $this->set(compact('linksBlocks', 'languages')); } /** * edit method * + * @param string $id 仮 * @throws NotFoundException - * @param string $id * @return void */ public function edit($id = null) { - if (!$this->LinkListsCategory->exists($id)) { + if (!$this->LinksCategory->exists($id)) { throw new NotFoundException(__('Invalid link lists category')); } if ($this->request->is(array('post', 'put'))) { - if ($this->LinkListsCategory->save($this->request->data)) { + if ($this->LinksCategory->save($this->request->data)) { $this->Session->setFlash(__('The link lists category has been saved.')); return $this->redirect(array('action' => 'index')); } else { $this->Session->setFlash(__('The link lists category could not be saved. Please, try again.')); } } else { - $options = array('conditions' => array('LinkListsCategory.' . $this->LinkListsCategory->primaryKey => $id)); - $this->request->data = $this->LinkListsCategory->find('first', $options); + $options = array('conditions' => array('LinksCategory.' . $this->LinksCategory->primaryKey => $id)); + $this->request->data = $this->LinksCategory->find('first', $options); } - $linklistsBlocks = $this->LinkListsCategory->LinklistsBlock->find('list'); - $languages = $this->LinkListsCategory->Language->find('list'); - $this->set(compact('linklistsBlocks', 'languages')); + $linksBlocks = $this->LinksCategory->LinksBlock->find('list'); + $languages = $this->LinksCategory->Language->find('list'); + $this->set(compact('linksBlocks', 'languages')); } /** * delete method * + * @param string $id 仮 * @throws NotFoundException - * @param string $id * @return void */ public function delete($id = null) { - $this->LinkListsCategory->id = $id; - if (!$this->LinkListsCategory->exists()) { + $this->LinksCategory->id = $id; + if (!$this->LinksCategory->exists()) { throw new NotFoundException(__('Invalid link lists category')); } $this->request->onlyAllow('post', 'delete'); - if ($this->LinkListsCategory->delete()) { + if ($this->LinksCategory->delete()) { $this->Session->setFlash(__('The link lists category has been deleted.')); } else { $this->Session->setFlash(__('The link lists category could not be deleted. Please, try again.')); diff --git a/Controller/LinksController.php b/Controller/LinksController.php new file mode 100644 index 0000000..0dcdd9f --- /dev/null +++ b/Controller/LinksController.php @@ -0,0 +1,118 @@ + + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License + */ +class LinksController extends LinksAppController { + +/** + * Components + * + * @var array + */ + public $components = array('Paginator'); + +/** + * index method + * + * @return void + */ + public function index() { + $this->Link->recursive = 0; + $this->set('linkLists', $this->Paginator->paginate()); + } + +/** + * view method + * + * @param string $id 仮 + * @throws NotFoundException + * @return void + */ + public function view($id = null) { + if (!$this->Link->exists($id)) { + throw new NotFoundException(__('Invalid link list')); + } + $options = array('conditions' => array('Link.' . $this->Link->primaryKey => $id)); + $this->set('linkList', $this->Link->find('first', $options)); + } + +/** + * add method + * + * @return void + */ + public function add() { + if ($this->request->is('post')) { + $this->Link->create(); + if ($this->Link->save($this->request->data)) { + $this->Session->setFlash(__('The link list has been saved.')); + return $this->redirect(array('action' => 'index')); + } else { + $this->Session->setFlash(__('The link list could not be saved. Please, try again.')); + } + } + $linksBlocks = $this->Link->LinksBlock->find('list'); + $languages = $this->Link->Language->find('list'); + $linksCategories = $this->Link->LinksCategory->find('list'); + $blocks = $this->Link->Block->find('list'); + $this->set(compact('linksBlocks', 'languages', 'linksCategories', 'blocks')); + } + +/** + * edit method + * + * @param string $id 仮 + * @throws NotFoundException + * @return void + */ + public function edit($id = null) { + if (!$this->Link->exists($id)) { + throw new NotFoundException(__('Invalid link list')); + } + if ($this->request->is(array('post', 'put'))) { + if ($this->Link->save($this->request->data)) { + $this->Session->setFlash(__('The link list has been saved.')); + return $this->redirect(array('action' => 'index')); + } else { + $this->Session->setFlash(__('The link list could not be saved. Please, try again.')); + } + } else { + $options = array('conditions' => array('Link.' . $this->Link->primaryKey => $id)); + $this->request->data = $this->Link->find('first', $options); + } + $linksBlocks = $this->Link->LinksBlock->find('list'); + $languages = $this->Link->Language->find('list'); + $linksCategories = $this->Link->LinksCategory->find('list'); + $blocks = $this->Link->Block->find('list'); + $this->set(compact('linksBlocks', 'languages', 'linksCategories', 'blocks')); + } + +/** + * delete method + * + * @param string $id kari + * @throws NotFoundException + * @return void + */ + public function delete($id = null) { + $this->Link->id = $id; + if (!$this->Link->exists()) { + throw new NotFoundException(__('Invalid link list')); + } + $this->request->onlyAllow('post', 'delete'); + if ($this->Link->delete()) { + $this->Session->setFlash(__('The link list has been deleted.')); + } else { + $this->Session->setFlash(__('The link list could not be deleted. Please, try again.')); + } + return $this->redirect(array('action' => 'index')); + } +} diff --git a/Model/Linklist.php b/Model/Link.php similarity index 78% rename from Model/Linklist.php rename to Model/Link.php index 37e50b9..be27271 100644 --- a/Model/Linklist.php +++ b/Model/Link.php @@ -1,23 +1,23 @@ -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License + * @author Jun Nishikawa + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License */ -App::uses('LinkListsAppModel', 'LinkLists.Model'); +App::uses('LinksAppModel', 'Links.Model'); /** - * Summary for Linklist Model + * Summary for Link Model */ -class Linklist extends LinkListsAppModel { +class Link extends LinksAppModel { /** * Use database config @@ -32,7 +32,7 @@ class Linklist extends LinkListsAppModel { * @var array */ public $validate = array( - 'linklists_block_id' => array( + 'links_block_id' => array( 'numeric' => array( 'rule' => array('numeric'), //'message' => 'Your custom message here', @@ -92,9 +92,9 @@ class Linklist extends LinkListsAppModel { * @var array */ public $belongsTo = array( - 'LinklistsBlock' => array( - 'className' => 'LinklistsBlock', - 'foreignKey' => 'linklists_block_id', + 'LinksBlock' => array( + 'className' => 'LinksBlock', + 'foreignKey' => 'links_block_id', 'conditions' => '', 'fields' => '', 'order' => '' @@ -106,9 +106,9 @@ class Linklist extends LinkListsAppModel { 'fields' => '', 'order' => '' ), - 'LinklistsCategory' => array( - 'className' => 'LinklistsCategory', - 'foreignKey' => 'linklists_category_id', + 'LinksCategory' => array( + 'className' => 'LinksCategory', + 'foreignKey' => 'links_category_id', 'conditions' => '', 'fields' => '', 'order' => '' @@ -123,8 +123,8 @@ class Linklist extends LinkListsAppModel { public $hasAndBelongsToMany = array( 'Block' => array( 'className' => 'Block', - 'joinTable' => 'linklists_blocks', - 'foreignKey' => 'linklist_id', + 'joinTable' => 'links_blocks', + 'foreignKey' => 'link_id', 'associationForeignKey' => 'block_id', 'unique' => 'keepExisting', 'conditions' => '', diff --git a/Model/LinklistPartSetting.php b/Model/LinkPartSetting.php similarity index 83% rename from Model/LinklistPartSetting.php rename to Model/LinkPartSetting.php index 870aacc..7fe5b56 100644 --- a/Model/LinklistPartSetting.php +++ b/Model/LinkPartSetting.php @@ -1,21 +1,21 @@ -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License + * @author Jun Nishikawa + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License */ -App::uses('LinkListsAppModel', 'LinkLists.Model'); +App::uses('LinksAppModel', 'Links.Model'); /** - * Summary for LinklistPartSetting Model + * Summary for LinkPartSetting Model */ -class LinklistPartSetting extends LinkListsAppModel { +class LinkPartSetting extends LinksAppModel { /** * Use database config @@ -30,7 +30,7 @@ class LinklistPartSetting extends LinkListsAppModel { * @var array */ public $validate = array( - 'linklist_block_id' => array( + 'link_block_id' => array( 'numeric' => array( 'rule' => array('numeric'), //'message' => 'Your custom message here', @@ -100,9 +100,9 @@ class LinklistPartSetting extends LinkListsAppModel { * @var array */ public $belongsTo = array( - 'LinklistBlock' => array( - 'className' => 'LinklistBlock', - 'foreignKey' => 'linklist_block_id', + 'LinkBlock' => array( + 'className' => 'LinkBlock', + 'foreignKey' => 'link_block_id', 'conditions' => '', 'fields' => '', 'order' => '' diff --git a/Model/LinklistSetting.php b/Model/LinkSetting.php similarity index 59% rename from Model/LinklistSetting.php rename to Model/LinkSetting.php index e44285c..a1e9cfd 100644 --- a/Model/LinklistSetting.php +++ b/Model/LinkSetting.php @@ -1,20 +1,20 @@ -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License + * @author Jun Nishikawa + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License */ -App::uses('LinkListsAppModel', 'LinkLists.Model'); +App::uses('LinksAppModel', 'Links.Model'); /** - * Summary for LinklistSetting Model + * Summary for LinkSetting Model */ -class LinklistSetting extends LinkListsAppModel { +class LinkSetting extends LinksAppModel { /** * Use database config @@ -29,7 +29,7 @@ class LinklistSetting extends LinkListsAppModel { * @var array */ public $validate = array( - 'linklist_block_id' => array( + 'link_block_id' => array( 'numeric' => array( 'rule' => array('numeric'), //'message' => 'Your custom message here', @@ -49,9 +49,9 @@ class LinklistSetting extends LinkListsAppModel { * @var array */ public $belongsTo = array( - 'LinklistBlock' => array( - 'className' => 'LinklistBlock', - 'foreignKey' => 'linklist_block_id', + 'LinkBlock' => array( + 'className' => 'LinkBlock', + 'foreignKey' => 'link_block_id', 'conditions' => '', 'fields' => '', 'order' => '' diff --git a/Model/LinkListsAppModel.php b/Model/LinksAppModel.php similarity index 50% rename from Model/LinkListsAppModel.php rename to Model/LinksAppModel.php index d3679d3..40c3512 100644 --- a/Model/LinkListsAppModel.php +++ b/Model/LinksAppModel.php @@ -2,6 +2,6 @@ App::uses('AppModel', 'Model'); -class LinkListsAppModel extends AppModel { +class LinksAppModel extends AppModel { } diff --git a/Model/LinklistsBlock.php b/Model/LinksBlock.php similarity index 68% rename from Model/LinklistsBlock.php rename to Model/LinksBlock.php index f047f9b..f708006 100644 --- a/Model/LinklistsBlock.php +++ b/Model/LinksBlock.php @@ -1,22 +1,22 @@ -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License + * @author Jun Nishikawa + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License */ -App::uses('LinkListsAppModel', 'LinkLists.Model'); +App::uses('LinksAppModel', 'Links.Model'); /** - * Summary for LinklistsBlock Model + * Summary for LinksBlock Model */ -class LinklistsBlock extends LinkListsAppModel { +class LinksBlock extends LinksAppModel { /** * Use database config @@ -66,9 +66,9 @@ class LinklistsBlock extends LinkListsAppModel { * @var array */ public $hasMany = array( - 'Linklist' => array( - 'className' => 'Linklist', - 'foreignKey' => 'linklists_block_id', + 'Link' => array( + 'className' => 'Link', + 'foreignKey' => 'links_block_id', 'dependent' => false, 'conditions' => '', 'fields' => '', @@ -79,9 +79,9 @@ class LinklistsBlock extends LinkListsAppModel { 'finderQuery' => '', 'counterQuery' => '' ), - 'LinklistsCategory' => array( - 'className' => 'LinklistsCategory', - 'foreignKey' => 'linklists_block_id', + 'LinksCategory' => array( + 'className' => 'LinksCategory', + 'foreignKey' => 'links_block_id', 'dependent' => false, 'conditions' => '', 'fields' => '', diff --git a/Model/LinklistsCategory.php b/Model/LinksCategory.php similarity index 77% rename from Model/LinklistsCategory.php rename to Model/LinksCategory.php index 9405527..a3512cb 100644 --- a/Model/LinklistsCategory.php +++ b/Model/LinksCategory.php @@ -1,22 +1,22 @@ -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License + * @author Jun Nishikawa + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License */ -App::uses('LinkListsAppModel', 'LinkLists.Model'); +App::uses('LinksAppModel', 'Links.Model'); /** - * Summary for LinklistsCategory Model + * Summary for LinksCategory Model */ -class LinklistsCategory extends LinkListsAppModel { +class LinksCategory extends LinksAppModel { /** * Use database config @@ -31,7 +31,7 @@ class LinklistsCategory extends LinkListsAppModel { * @var array */ public $validate = array( - 'linklists_block_id' => array( + 'links_block_id' => array( 'numeric' => array( 'rule' => array('numeric'), //'message' => 'Your custom message here', @@ -81,9 +81,9 @@ class LinklistsCategory extends LinkListsAppModel { * @var array */ public $belongsTo = array( - 'LinklistsBlock' => array( - 'className' => 'LinklistsBlock', - 'foreignKey' => 'linklists_block_id', + 'LinksBlock' => array( + 'className' => 'LinksBlock', + 'foreignKey' => 'links_block_id', 'conditions' => '', 'fields' => '', 'order' => '' @@ -103,9 +103,9 @@ class LinklistsCategory extends LinkListsAppModel { * @var array */ public $hasMany = array( - 'Linklist' => array( - 'className' => 'Linklist', - 'foreignKey' => 'linklists_category_id', + 'Link' => array( + 'className' => 'Link', + 'foreignKey' => 'links_category_id', 'dependent' => false, 'conditions' => '', 'fields' => '', diff --git a/Test/Case/Controller/LinkListsCategoriesControllerTest.php b/Test/Case/Controller/LinksCategoriesControllerTest.php similarity index 53% rename from Test/Case/Controller/LinkListsCategoriesControllerTest.php rename to Test/Case/Controller/LinksCategoriesControllerTest.php index 2e7b1c3..68d02ac 100644 --- a/Test/Case/Controller/LinkListsCategoriesControllerTest.php +++ b/Test/Case/Controller/LinksCategoriesControllerTest.php @@ -1,18 +1,18 @@ -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License + * @author Jun Nishikawa + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License */ -App::uses('LinkListsCategoriesController', 'LinkLists.Controller'); +App::uses('LinksCategoriesController', 'Links.Controller'); /** - * Summary for LinkListsCategoriesController Test Case + * Summary for LinksCategoriesController Test Case */ -class LinkListsCategoriesControllerTest extends ControllerTestCase { +class LinksCategoriesControllerTest extends ControllerTestCase { /** * Fixtures @@ -20,10 +20,10 @@ class LinkListsCategoriesControllerTest extends ControllerTestCase { * @var array */ public $fixtures = array( - 'plugin.link_lists.linklists_category', - 'plugin.link_lists.linklists_block', + 'plugin.link_lists.links_category', + 'plugin.link_lists.links_block', 'plugin.link_lists.language', - 'plugin.link_lists.linklist', + 'plugin.link_lists.link', 'plugin.link_lists.site_setting', 'plugin.link_lists.site_setting_value' ); diff --git a/Test/Case/Controller/LinkListsControllerTest.php b/Test/Case/Controller/LinksControllerTest.php similarity index 58% rename from Test/Case/Controller/LinkListsControllerTest.php rename to Test/Case/Controller/LinksControllerTest.php index 5c62fb0..d75763a 100644 --- a/Test/Case/Controller/LinkListsControllerTest.php +++ b/Test/Case/Controller/LinksControllerTest.php @@ -1,18 +1,18 @@ -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License + * @author Jun Nishikawa + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License */ -App::uses('LinkListsController', 'LinkLists.Controller'); +App::uses('LinksController', 'Links.Controller'); /** - * Summary for LinkListsController Test Case + * Summary for LinksController Test Case */ -class LinkListsControllerTest extends ControllerTestCase { +class LinksControllerTest extends ControllerTestCase { /** * Fixtures @@ -20,10 +20,10 @@ class LinkListsControllerTest extends ControllerTestCase { * @var array */ public $fixtures = array( - 'plugin.link_lists.linklist', - 'plugin.link_lists.linklists_block', + 'plugin.link_lists.link', + 'plugin.link_lists.links_block', 'plugin.link_lists.language', - 'plugin.link_lists.linklists_category', + 'plugin.link_lists.links_category', 'plugin.link_lists.block', 'plugin.link_lists.blocks_language', 'plugin.link_lists.site_setting', diff --git a/Test/Case/Model/LinkPartSettingTest.php b/Test/Case/Model/LinkPartSettingTest.php new file mode 100644 index 0000000..7cfcfa4 --- /dev/null +++ b/Test/Case/Model/LinkPartSettingTest.php @@ -0,0 +1,51 @@ + + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('LinkPartSetting', 'Links.Model'); + +/** + * Summary for LinkPartSetting Test Case + */ +class LinkPartSettingTest extends CakeTestCase { + +/** + * Fixtures + * + * @var array + */ + public $fixtures = array( + 'plugin.link_lists.link_part_setting', + 'plugin.link_lists.link_block', + 'plugin.link_lists.part', + 'plugin.link_lists.language', + 'plugin.link_lists.languages_part' + ); + +/** + * setUp method + * + * @return void + */ + public function setUp() { + parent::setUp(); + $this->LinkPartSetting = ClassRegistry::init('Links.LinkPartSetting'); + } + +/** + * tearDown method + * + * @return void + */ + public function tearDown() { + unset($this->LinkPartSetting); + + parent::tearDown(); + } + +} diff --git a/Test/Case/Model/LinkSettingTest.php b/Test/Case/Model/LinkSettingTest.php new file mode 100644 index 0000000..535e372 --- /dev/null +++ b/Test/Case/Model/LinkSettingTest.php @@ -0,0 +1,48 @@ + + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('LinkSetting', 'Links.Model'); + +/** + * Summary for LinkSetting Test Case + */ +class LinkSettingTest extends CakeTestCase { + +/** + * Fixtures + * + * @var array + */ + public $fixtures = array( + 'plugin.link_lists.link_setting', + 'plugin.link_lists.link_block' + ); + +/** + * setUp method + * + * @return void + */ + public function setUp() { + parent::setUp(); + $this->LinkSetting = ClassRegistry::init('Links.LinkSetting'); + } + +/** + * tearDown method + * + * @return void + */ + public function tearDown() { + unset($this->LinkSetting); + + parent::tearDown(); + } + +} diff --git a/Test/Case/Model/LinkTest.php b/Test/Case/Model/LinkTest.php new file mode 100644 index 0000000..5ba4d09 --- /dev/null +++ b/Test/Case/Model/LinkTest.php @@ -0,0 +1,52 @@ + + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('Link', 'Links.Model'); + +/** + * Summary for Link Test Case + */ +class LinkTest extends CakeTestCase { + +/** + * Fixtures + * + * @var array + */ + public $fixtures = array( + 'plugin.link_lists.link', + 'plugin.link_lists.links_block', + 'plugin.link_lists.language', + 'plugin.link_lists.links_category', + 'plugin.link_lists.block', + 'plugin.link_lists.blocks_language' + ); + +/** + * setUp method + * + * @return void + */ + public function setUp() { + parent::setUp(); + $this->Link = ClassRegistry::init('Links.Link'); + } + +/** + * tearDown method + * + * @return void + */ + public function tearDown() { + unset($this->Link); + + parent::tearDown(); + } + +} diff --git a/Test/Case/Model/LinklistPartSettingTest.php b/Test/Case/Model/LinklistPartSettingTest.php deleted file mode 100644 index ebc516f..0000000 --- a/Test/Case/Model/LinklistPartSettingTest.php +++ /dev/null @@ -1,51 +0,0 @@ - -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License - */ - -App::uses('LinklistPartSetting', 'LinkLists.Model'); - -/** - * Summary for LinklistPartSetting Test Case - */ -class LinklistPartSettingTest extends CakeTestCase { - -/** - * Fixtures - * - * @var array - */ - public $fixtures = array( - 'plugin.link_lists.linklist_part_setting', - 'plugin.link_lists.linklist_block', - 'plugin.link_lists.part', - 'plugin.link_lists.language', - 'plugin.link_lists.languages_part' - ); - -/** - * setUp method - * - * @return void - */ - public function setUp() { - parent::setUp(); - $this->LinklistPartSetting = ClassRegistry::init('LinkLists.LinklistPartSetting'); - } - -/** - * tearDown method - * - * @return void - */ - public function tearDown() { - unset($this->LinklistPartSetting); - - parent::tearDown(); - } - -} diff --git a/Test/Case/Model/LinklistSettingTest.php b/Test/Case/Model/LinklistSettingTest.php deleted file mode 100644 index b85ee01..0000000 --- a/Test/Case/Model/LinklistSettingTest.php +++ /dev/null @@ -1,48 +0,0 @@ - -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License - */ - -App::uses('LinklistSetting', 'LinkLists.Model'); - -/** - * Summary for LinklistSetting Test Case - */ -class LinklistSettingTest extends CakeTestCase { - -/** - * Fixtures - * - * @var array - */ - public $fixtures = array( - 'plugin.link_lists.linklist_setting', - 'plugin.link_lists.linklist_block' - ); - -/** - * setUp method - * - * @return void - */ - public function setUp() { - parent::setUp(); - $this->LinklistSetting = ClassRegistry::init('LinkLists.LinklistSetting'); - } - -/** - * tearDown method - * - * @return void - */ - public function tearDown() { - unset($this->LinklistSetting); - - parent::tearDown(); - } - -} diff --git a/Test/Case/Model/LinklistTest.php b/Test/Case/Model/LinklistTest.php deleted file mode 100644 index e5eb9a3..0000000 --- a/Test/Case/Model/LinklistTest.php +++ /dev/null @@ -1,52 +0,0 @@ - -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License - */ - -App::uses('Linklist', 'LinkLists.Model'); - -/** - * Summary for Linklist Test Case - */ -class LinklistTest extends CakeTestCase { - -/** - * Fixtures - * - * @var array - */ - public $fixtures = array( - 'plugin.link_lists.linklist', - 'plugin.link_lists.linklists_block', - 'plugin.link_lists.language', - 'plugin.link_lists.linklists_category', - 'plugin.link_lists.block', - 'plugin.link_lists.blocks_language' - ); - -/** - * setUp method - * - * @return void - */ - public function setUp() { - parent::setUp(); - $this->Linklist = ClassRegistry::init('LinkLists.Linklist'); - } - -/** - * tearDown method - * - * @return void - */ - public function tearDown() { - unset($this->Linklist); - - parent::tearDown(); - } - -} diff --git a/Test/Case/Model/LinklistsBlockTest.php b/Test/Case/Model/LinklistsBlockTest.php deleted file mode 100644 index fdbbc8e..0000000 --- a/Test/Case/Model/LinklistsBlockTest.php +++ /dev/null @@ -1,52 +0,0 @@ - -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License - */ - -App::uses('LinklistsBlock', 'LinkLists.Model'); - -/** - * Summary for LinklistsBlock Test Case - */ -class LinklistsBlockTest extends CakeTestCase { - -/** - * Fixtures - * - * @var array - */ - public $fixtures = array( - 'plugin.link_lists.linklists_block', - 'plugin.link_lists.block', - 'plugin.link_lists.language', - 'plugin.link_lists.blocks_language', - 'plugin.link_lists.linklist', - 'plugin.link_lists.linklists_category' - ); - -/** - * setUp method - * - * @return void - */ - public function setUp() { - parent::setUp(); - $this->LinklistsBlock = ClassRegistry::init('LinkLists.LinklistsBlock'); - } - -/** - * tearDown method - * - * @return void - */ - public function tearDown() { - unset($this->LinklistsBlock); - - parent::tearDown(); - } - -} diff --git a/Test/Case/Model/LinklistsCategoryTest.php b/Test/Case/Model/LinklistsCategoryTest.php deleted file mode 100644 index fbfc49e..0000000 --- a/Test/Case/Model/LinklistsCategoryTest.php +++ /dev/null @@ -1,50 +0,0 @@ - -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License - */ - -App::uses('LinklistsCategory', 'LinkLists.Model'); - -/** - * Summary for LinklistsCategory Test Case - */ -class LinklistsCategoryTest extends CakeTestCase { - -/** - * Fixtures - * - * @var array - */ - public $fixtures = array( - 'plugin.link_lists.linklists_category', - 'plugin.link_lists.linklists_block', - 'plugin.link_lists.language', - 'plugin.link_lists.linklist' - ); - -/** - * setUp method - * - * @return void - */ - public function setUp() { - parent::setUp(); - $this->LinklistsCategory = ClassRegistry::init('LinkLists.LinklistsCategory'); - } - -/** - * tearDown method - * - * @return void - */ - public function tearDown() { - unset($this->LinklistsCategory); - - parent::tearDown(); - } - -} diff --git a/Test/Case/Model/LinksBlockTest.php b/Test/Case/Model/LinksBlockTest.php new file mode 100644 index 0000000..8972507 --- /dev/null +++ b/Test/Case/Model/LinksBlockTest.php @@ -0,0 +1,52 @@ + + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('LinksBlock', 'Links.Model'); + +/** + * Summary for LinksBlock Test Case + */ +class LinksBlockTest extends CakeTestCase { + +/** + * Fixtures + * + * @var array + */ + public $fixtures = array( + 'plugin.link_lists.links_block', + 'plugin.link_lists.block', + 'plugin.link_lists.language', + 'plugin.link_lists.blocks_language', + 'plugin.link_lists.link', + 'plugin.link_lists.links_category' + ); + +/** + * setUp method + * + * @return void + */ + public function setUp() { + parent::setUp(); + $this->LinksBlock = ClassRegistry::init('Links.LinksBlock'); + } + +/** + * tearDown method + * + * @return void + */ + public function tearDown() { + unset($this->LinksBlock); + + parent::tearDown(); + } + +} diff --git a/Test/Case/Model/LinksCategoryTest.php b/Test/Case/Model/LinksCategoryTest.php new file mode 100644 index 0000000..e4815d4 --- /dev/null +++ b/Test/Case/Model/LinksCategoryTest.php @@ -0,0 +1,50 @@ + + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('LinksCategory', 'Links.Model'); + +/** + * Summary for LinksCategory Test Case + */ +class LinksCategoryTest extends CakeTestCase { + +/** + * Fixtures + * + * @var array + */ + public $fixtures = array( + 'plugin.link_lists.links_category', + 'plugin.link_lists.links_block', + 'plugin.link_lists.language', + 'plugin.link_lists.link' + ); + +/** + * setUp method + * + * @return void + */ + public function setUp() { + parent::setUp(); + $this->LinksCategory = ClassRegistry::init('Links.LinksCategory'); + } + +/** + * tearDown method + * + * @return void + */ + public function tearDown() { + unset($this->LinksCategory); + + parent::tearDown(); + } + +} diff --git a/Test/Fixture/LinklistFixture.php b/Test/Fixture/LinkFixture.php similarity index 81% rename from Test/Fixture/LinklistFixture.php rename to Test/Fixture/LinkFixture.php index d400499..938ad2f 100644 --- a/Test/Fixture/LinklistFixture.php +++ b/Test/Fixture/LinkFixture.php @@ -1,16 +1,16 @@ -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License + * @author Jun Nishikawa + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License */ /** - * Summary for LinklistFixture + * Summary for LinkFixture */ -class LinklistFixture extends CakeTestFixture { +class LinkFixture extends CakeTestFixture { /** * Fields @@ -19,12 +19,12 @@ class LinklistFixture extends CakeTestFixture { */ public $fields = array( 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'key' => 'primary'), - 'linklists_block_id' => array('type' => 'integer', 'null' => false, 'default' => null), + 'links_block_id' => array('type' => 'integer', 'null' => false, 'default' => null), 'status' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 3), 'language_id' => array('type' => 'integer', 'null' => false, 'default' => '2'), 'is_auto_translated' => array('type' => 'boolean', 'null' => false, 'default' => '0'), 'translation_engine' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'), - 'linklists_category_id' => array('type' => 'integer', 'null' => true, 'default' => null), + 'links_category_id' => array('type' => 'integer', 'null' => true, 'default' => null), 'title' => array('type' => 'string', 'null' => true, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'), 'url' => array('type' => 'string', 'null' => false, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'), 'description' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'), @@ -46,12 +46,12 @@ class LinklistFixture extends CakeTestFixture { public $records = array( array( 'id' => 1, - 'linklists_block_id' => 1, + 'links_block_id' => 1, 'status' => 1, 'language_id' => 1, 'is_auto_translated' => 1, 'translation_engine' => 'Lorem ipsum dolor sit amet', - 'linklists_category_id' => 1, + 'links_category_id' => 1, 'title' => 'Lorem ipsum dolor sit amet', 'url' => 'Lorem ipsum dolor sit amet', 'description' => 'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.', diff --git a/Test/Fixture/LinklistPartSettingFixture.php b/Test/Fixture/LinkPartSettingFixture.php similarity index 77% rename from Test/Fixture/LinklistPartSettingFixture.php rename to Test/Fixture/LinkPartSettingFixture.php index 4623518..24604ce 100644 --- a/Test/Fixture/LinklistPartSettingFixture.php +++ b/Test/Fixture/LinkPartSettingFixture.php @@ -1,16 +1,16 @@ -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License + * @author Jun Nishikawa + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License */ /** - * Summary for LinklistPartSettingFixture + * Summary for LinkPartSettingFixture */ -class LinklistPartSettingFixture extends CakeTestFixture { +class LinkPartSettingFixture extends CakeTestFixture { /** * Fields @@ -19,7 +19,7 @@ class LinklistPartSettingFixture extends CakeTestFixture { */ public $fields = array( 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'key' => 'primary'), - 'linklist_block_id' => array('type' => 'integer', 'null' => false, 'default' => null), + 'link_block_id' => array('type' => 'integer', 'null' => false, 'default' => null), 'part_id' => array('type' => 'integer', 'null' => false, 'default' => '0'), 'readable_content' => array('type' => 'boolean', 'null' => false, 'default' => '0'), 'editable_content' => array('type' => 'boolean', 'null' => false, 'default' => '0'), @@ -43,7 +43,7 @@ class LinklistPartSettingFixture extends CakeTestFixture { public $records = array( array( 'id' => 1, - 'linklist_block_id' => 1, + 'link_block_id' => 1, 'part_id' => 1, 'readable_content' => 1, 'editable_content' => 1, diff --git a/Test/Fixture/LinklistSettingFixture.php b/Test/Fixture/LinkSettingFixture.php similarity index 69% rename from Test/Fixture/LinklistSettingFixture.php rename to Test/Fixture/LinkSettingFixture.php index 8bf60c0..d92ffed 100644 --- a/Test/Fixture/LinklistSettingFixture.php +++ b/Test/Fixture/LinkSettingFixture.php @@ -1,16 +1,16 @@ -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License + * @author Jun Nishikawa + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License */ /** - * Summary for LinklistSettingFixture + * Summary for LinkSettingFixture */ -class LinklistSettingFixture extends CakeTestFixture { +class LinkSettingFixture extends CakeTestFixture { /** * Fields @@ -19,7 +19,7 @@ class LinklistSettingFixture extends CakeTestFixture { */ public $fields = array( 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'key' => 'primary'), - 'linklist_block_id' => array('type' => 'integer', 'null' => false, 'default' => null), + 'link_block_id' => array('type' => 'integer', 'null' => false, 'default' => null), 'created_user' => array('type' => 'integer', 'null' => true, 'default' => null), 'created' => array('type' => 'datetime', 'null' => true, 'default' => null), 'modified_user' => array('type' => 'integer', 'null' => true, 'default' => null), @@ -38,7 +38,7 @@ class LinklistSettingFixture extends CakeTestFixture { public $records = array( array( 'id' => 1, - 'linklist_block_id' => 1, + 'link_block_id' => 1, 'created_user' => 1, 'created' => '2014-08-30 00:55:24', 'modified_user' => 1, diff --git a/Test/Fixture/LinklistsBlockFixture.php b/Test/Fixture/LinksBlockFixture.php similarity index 77% rename from Test/Fixture/LinklistsBlockFixture.php rename to Test/Fixture/LinksBlockFixture.php index 0b741b6..c0cd05c 100644 --- a/Test/Fixture/LinklistsBlockFixture.php +++ b/Test/Fixture/LinksBlockFixture.php @@ -1,16 +1,16 @@ -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License + * @author Jun Nishikawa + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License */ /** - * Summary for LinklistsBlockFixture + * Summary for LinksBlockFixture */ -class LinklistsBlockFixture extends CakeTestFixture { +class LinksBlockFixture extends CakeTestFixture { /** * Fields diff --git a/Test/Fixture/LinklistsCategoryFixture.php b/Test/Fixture/LinksCategoryFixture.php similarity index 79% rename from Test/Fixture/LinklistsCategoryFixture.php rename to Test/Fixture/LinksCategoryFixture.php index 27d5a14..88aa2c3 100644 --- a/Test/Fixture/LinklistsCategoryFixture.php +++ b/Test/Fixture/LinksCategoryFixture.php @@ -1,16 +1,16 @@ -* @link http://www.netcommons.org NetCommons Project -* @license http://www.netcommons.org/license.txt NetCommons License + * @author Jun Nishikawa + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License */ /** - * Summary for LinklistsCategoryFixture + * Summary for LinksCategoryFixture */ -class LinklistsCategoryFixture extends CakeTestFixture { +class LinksCategoryFixture extends CakeTestFixture { /** * Fields @@ -19,7 +19,7 @@ class LinklistsCategoryFixture extends CakeTestFixture { */ public $fields = array( 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'key' => 'primary'), - 'linklists_block_id' => array('type' => 'integer', 'null' => false, 'default' => null), + 'links_block_id' => array('type' => 'integer', 'null' => false, 'default' => null), 'status' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 3), 'language_id' => array('type' => 'integer', 'null' => false, 'default' => '2'), 'is_auto_translated' => array('type' => 'boolean', 'null' => false, 'default' => '0'), @@ -43,7 +43,7 @@ class LinklistsCategoryFixture extends CakeTestFixture { public $records = array( array( 'id' => 1, - 'linklists_block_id' => 1, + 'links_block_id' => 1, 'status' => 1, 'language_id' => 1, 'is_auto_translated' => 1, From 2c7226ebd9d3f259d14cc83f8e3293c6306f8261 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Sat, 30 Aug 2014 02:03:17 +0000 Subject: [PATCH 02/53] LinkLisrename LinkLists to Links --- Controller/LinksCategoriesController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Controller/LinksCategoriesController.php b/Controller/LinksCategoriesController.php index 4bac63a..7b26d36 100644 --- a/Controller/LinksCategoriesController.php +++ b/Controller/LinksCategoriesController.php @@ -110,4 +110,5 @@ public function delete($id = null) { $this->Session->setFlash(__('The link lists category could not be deleted. Please, try again.')); } return $this->redirect(array('action' => 'index')); - }} + } +} From 631737920b215ad7caa3073abbf696e53c0855f6 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Sat, 30 Aug 2014 04:26:05 +0000 Subject: [PATCH 03/53] add view files --- Test/Case/View/Helper/empty | 0 View/Links/add.ctp | 36 +++++++++ View/Links/edit.ctp | 38 ++++++++++ View/Links/index.ctp | 78 ++++++++++++++++++++ View/Links/view.ctp | 129 +++++++++++++++++++++++++++++++++ View/LinksCategories/add.ctp | 30 ++++++++ View/LinksCategories/edit.ctp | 32 ++++++++ View/LinksCategories/index.ctp | 68 +++++++++++++++++ View/LinksCategories/view.ctp | 128 ++++++++++++++++++++++++++++++++ 9 files changed, 539 insertions(+) delete mode 100644 Test/Case/View/Helper/empty create mode 100644 View/Links/add.ctp create mode 100644 View/Links/edit.ctp create mode 100644 View/Links/index.ctp create mode 100644 View/Links/view.ctp create mode 100644 View/LinksCategories/add.ctp create mode 100644 View/LinksCategories/edit.ctp create mode 100644 View/LinksCategories/index.ctp create mode 100644 View/LinksCategories/view.ctp diff --git a/Test/Case/View/Helper/empty b/Test/Case/View/Helper/empty deleted file mode 100644 index e69de29..0000000 diff --git a/View/Links/add.ctp b/View/Links/add.ctp new file mode 100644 index 0000000..3b371b4 --- /dev/null +++ b/View/Links/add.ctp @@ -0,0 +1,36 @@ +
+Form->create('Link'); ?> +
+ + Form->input('links_block_id'); + echo $this->Form->input('status'); + echo $this->Form->input('language_id'); + echo $this->Form->input('is_auto_translated'); + echo $this->Form->input('translation_engine'); + echo $this->Form->input('links_category_id'); + echo $this->Form->input('title'); + echo $this->Form->input('url'); + echo $this->Form->input('description'); + echo $this->Form->input('created_user'); + echo $this->Form->input('modified_user'); + echo $this->Form->input('Block'); + ?> +
+Form->end(__('Submit')); ?> +
+
+

+
    + +
  • Html->link(__('List Links'), array('action' => 'index')); ?>
    • +
  • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Links Categories'), array('controller' => 'links_categories', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Links Category'), array('controller' => 'links_categories', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Blocks'), array('controller' => 'blocks', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Block'), array('controller' => 'blocks', 'action' => 'add')); ?>
    • +
+
diff --git a/View/Links/edit.ctp b/View/Links/edit.ctp new file mode 100644 index 0000000..83f6e98 --- /dev/null +++ b/View/Links/edit.ctp @@ -0,0 +1,38 @@ +
+Form->create('Link'); ?> +
+ + Form->input('id'); + echo $this->Form->input('links_block_id'); + echo $this->Form->input('status'); + echo $this->Form->input('language_id'); + echo $this->Form->input('is_auto_translated'); + echo $this->Form->input('translation_engine'); + echo $this->Form->input('links_category_id'); + echo $this->Form->input('title'); + echo $this->Form->input('url'); + echo $this->Form->input('description'); + echo $this->Form->input('created_user'); + echo $this->Form->input('modified_user'); + echo $this->Form->input('Block'); + ?> +
+Form->end(__('Submit')); ?> +
+
+

+
    + +
  • Form->postLink(__('Delete'), array('action' => 'delete', $this->Form->value('Link.id')), null, __('Are you sure you want to delete # %s?', $this->Form->value('Link.id'))); ?>
    • +
  • Html->link(__('List Links'), array('action' => 'index')); ?>
    • +
  • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Links Categories'), array('controller' => 'links_categories', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Links Category'), array('controller' => 'links_categories', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Blocks'), array('controller' => 'blocks', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Block'), array('controller' => 'blocks', 'action' => 'add')); ?>
    • +
+
diff --git a/View/Links/index.ctp b/View/Links/index.ctp new file mode 100644 index 0000000..d78b224 --- /dev/null +++ b/View/Links/index.ctp @@ -0,0 +1,78 @@ +
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Paginator->sort('id'); ?>Paginator->sort('links_block_id'); ?>Paginator->sort('status'); ?>Paginator->sort('language_id'); ?>Paginator->sort('is_auto_translated'); ?>Paginator->sort('translation_engine'); ?>Paginator->sort('links_category_id'); ?>Paginator->sort('title'); ?>Paginator->sort('url'); ?>Paginator->sort('description'); ?>Paginator->sort('created_user'); ?>Paginator->sort('created'); ?>Paginator->sort('modified_user'); ?>Paginator->sort('modified'); ?>
  + Html->link($link['LinksBlock']['id'], array('controller' => 'links_blocks', 'action' => 'view', $link['LinksBlock']['id'])); ?> +   + Html->link($link['Language']['id'], array('controller' => 'languages', 'action' => 'view', $link['Language']['id'])); ?> +    + Html->link($link['LinksCategory']['title'], array('controller' => 'links_categories', 'action' => 'view', $link['LinksCategory']['id'])); ?> +         + Html->link(__('View'), array('action' => 'view', $link['Link']['id'])); ?> + Html->link(__('Edit'), array('action' => 'edit', $link['Link']['id'])); ?> + Form->postLink(__('Delete'), array('action' => 'delete', $link['Link']['id']), null, __('Are you sure you want to delete # %s?', $link['Link']['id'])); ?> +
+

+ Paginator->counter(array( + 'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}') + )); + ?>

+
+ Paginator->prev('< ' . __('previous'), array(), null, array('class' => 'prev disabled')); + echo $this->Paginator->numbers(array('separator' => '')); + echo $this->Paginator->next(__('next') . ' >', array(), null, array('class' => 'next disabled')); + ?> +
+
+
+

+
    +
  • Html->link(__('New Link'), array('action' => 'add')); ?>
    • +
  • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Links Categories'), array('controller' => 'links_categories', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Links Category'), array('controller' => 'links_categories', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Blocks'), array('controller' => 'blocks', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Block'), array('controller' => 'blocks', 'action' => 'add')); ?>
    • +
+
diff --git a/View/Links/view.ctp b/View/Links/view.ctp new file mode 100644 index 0000000..f5ab0b2 --- /dev/null +++ b/View/Links/view.ctp @@ -0,0 +1,129 @@ +
+

+
+
+
+ +   +
+
+
+ Html->link($link['LinksBlock']['id'], array('controller' => 'links_blocks', 'action' => 'view', $link['LinksBlock']['id'])); ?> +   +
+
+
+ +   +
+
+
+ Html->link($link['Language']['id'], array('controller' => 'languages', 'action' => 'view', $link['Language']['id'])); ?> +   +
+
+
+ +   +
+
+
+ +   +
+
+
+ Html->link($link['LinksCategory']['title'], array('controller' => 'links_categories', 'action' => 'view', $link['LinksCategory']['id'])); ?> +   +
+
+
+ +   +
+
+
+ +   +
+
+
+ +   +
+
+
+ +   +
+
+
+ +   +
+
+
+ +   +
+
+
+ +   +
+
+
+
+

+
    +
  • Html->link(__('Edit Link'), array('action' => 'edit', $link['Link']['id'])); ?>
    • +
  • Form->postLink(__('Delete Link'), array('action' => 'delete', $link['Link']['id']), null, __('Are you sure you want to delete # %s?', $link['Link']['id'])); ?>
    • +
  • Html->link(__('List Links'), array('action' => 'index')); ?>
    • +
  • Html->link(__('New Link'), array('action' => 'add')); ?>
    • +
  • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Links Categories'), array('controller' => 'links_categories', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Links Category'), array('controller' => 'links_categories', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Blocks'), array('controller' => 'blocks', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Block'), array('controller' => 'blocks', 'action' => 'add')); ?>
    • +
+
+
+

+ + + + + + + + + + + + + + + + + + + + + + +
+ Html->link(__('View'), array('controller' => 'blocks', 'action' => 'view', $block['id'])); ?> + Html->link(__('Edit'), array('controller' => 'blocks', 'action' => 'edit', $block['id'])); ?> + Form->postLink(__('Delete'), array('controller' => 'blocks', 'action' => 'delete', $block['id']), null, __('Are you sure you want to delete # %s?', $block['id'])); ?> +
+ + +
+
    +
  • Html->link(__('New Block'), array('controller' => 'blocks', 'action' => 'add')); ?>
    • +
+
+
diff --git a/View/LinksCategories/add.ctp b/View/LinksCategories/add.ctp new file mode 100644 index 0000000..e59ba07 --- /dev/null +++ b/View/LinksCategories/add.ctp @@ -0,0 +1,30 @@ +
+Form->create('LinksCategory'); ?> +
+ + Form->input('links_block_id'); + echo $this->Form->input('status'); + echo $this->Form->input('language_id'); + echo $this->Form->input('is_auto_translated'); + echo $this->Form->input('translation_engine'); + echo $this->Form->input('title'); + echo $this->Form->input('created_user'); + echo $this->Form->input('modified_user'); + ?> +
+Form->end(__('Submit')); ?> +
+
+

+
    + +
  • Html->link(__('List Links Categories'), array('action' => 'index')); ?>
    • +
  • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Links'), array('controller' => 'links', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Link'), array('controller' => 'links', 'action' => 'add')); ?>
    • +
+
diff --git a/View/LinksCategories/edit.ctp b/View/LinksCategories/edit.ctp new file mode 100644 index 0000000..912915d --- /dev/null +++ b/View/LinksCategories/edit.ctp @@ -0,0 +1,32 @@ +
+Form->create('LinksCategory'); ?> +
+ + Form->input('id'); + echo $this->Form->input('links_block_id'); + echo $this->Form->input('status'); + echo $this->Form->input('language_id'); + echo $this->Form->input('is_auto_translated'); + echo $this->Form->input('translation_engine'); + echo $this->Form->input('title'); + echo $this->Form->input('created_user'); + echo $this->Form->input('modified_user'); + ?> +
+Form->end(__('Submit')); ?> +
+
+

+
    + +
  • Form->postLink(__('Delete'), array('action' => 'delete', $this->Form->value('LinksCategory.id')), null, __('Are you sure you want to delete # %s?', $this->Form->value('LinksCategory.id'))); ?>
    • +
  • Html->link(__('List Links Categories'), array('action' => 'index')); ?>
    • +
  • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Links'), array('controller' => 'links', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Link'), array('controller' => 'links', 'action' => 'add')); ?>
    • +
+
diff --git a/View/LinksCategories/index.ctp b/View/LinksCategories/index.ctp new file mode 100644 index 0000000..62af884 --- /dev/null +++ b/View/LinksCategories/index.ctp @@ -0,0 +1,68 @@ +
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Paginator->sort('id'); ?>Paginator->sort('links_block_id'); ?>Paginator->sort('status'); ?>Paginator->sort('language_id'); ?>Paginator->sort('is_auto_translated'); ?>Paginator->sort('translation_engine'); ?>Paginator->sort('title'); ?>Paginator->sort('created_user'); ?>Paginator->sort('created'); ?>Paginator->sort('modified_user'); ?>Paginator->sort('modified'); ?>
  + Html->link($linksCategory['LinksBlock']['id'], array('controller' => 'links_blocks', 'action' => 'view', $linksCategory['LinksBlock']['id'])); ?> +   + Html->link($linksCategory['Language']['id'], array('controller' => 'languages', 'action' => 'view', $linksCategory['Language']['id'])); ?> +         + Html->link(__('View'), array('action' => 'view', $linksCategory['LinksCategory']['id'])); ?> + Html->link(__('Edit'), array('action' => 'edit', $linksCategory['LinksCategory']['id'])); ?> + Form->postLink(__('Delete'), array('action' => 'delete', $linksCategory['LinksCategory']['id']), null, __('Are you sure you want to delete # %s?', $linksCategory['LinksCategory']['id'])); ?> +
+

+ Paginator->counter(array( + 'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}') + )); + ?>

+
+ Paginator->prev('< ' . __('previous'), array(), null, array('class' => 'prev disabled')); + echo $this->Paginator->numbers(array('separator' => '')); + echo $this->Paginator->next(__('next') . ' >', array(), null, array('class' => 'next disabled')); + ?> +
+
+
+

+
    +
  • Html->link(__('New Links Category'), array('action' => 'add')); ?>
    • +
  • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Links'), array('controller' => 'links', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Link'), array('controller' => 'links', 'action' => 'add')); ?>
    • +
+
diff --git a/View/LinksCategories/view.ctp b/View/LinksCategories/view.ctp new file mode 100644 index 0000000..9426317 --- /dev/null +++ b/View/LinksCategories/view.ctp @@ -0,0 +1,128 @@ +
+

+
+
+
+ +   +
+
+
+ Html->link($linksCategory['LinksBlock']['id'], array('controller' => 'links_blocks', 'action' => 'view', $linksCategory['LinksBlock']['id'])); ?> +   +
+
+
+ +   +
+
+
+ Html->link($linksCategory['Language']['id'], array('controller' => 'languages', 'action' => 'view', $linksCategory['Language']['id'])); ?> +   +
+
+
+ +   +
+
+
+ +   +
+
+
+ +   +
+
+
+ +   +
+
+
+ +   +
+
+
+ +   +
+
+
+ +   +
+
+
+
+

+
    +
  • Html->link(__('Edit Links Category'), array('action' => 'edit', $linksCategory['LinksCategory']['id'])); ?>
    • +
  • Form->postLink(__('Delete Links Category'), array('action' => 'delete', $linksCategory['LinksCategory']['id']), null, __('Are you sure you want to delete # %s?', $linksCategory['LinksCategory']['id'])); ?>
    • +
  • Html->link(__('List Links Categories'), array('action' => 'index')); ?>
    • +
  • Html->link(__('New Links Category'), array('action' => 'add')); ?>
    • +
  • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Links'), array('controller' => 'links', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Link'), array('controller' => 'links', 'action' => 'add')); ?>
    • +
+
+
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Html->link(__('View'), array('controller' => 'links', 'action' => 'view', $link['id'])); ?> + Html->link(__('Edit'), array('controller' => 'links', 'action' => 'edit', $link['id'])); ?> + Form->postLink(__('Delete'), array('controller' => 'links', 'action' => 'delete', $link['id']), null, __('Are you sure you want to delete # %s?', $link['id'])); ?> +
+ + +
+
    +
  • Html->link(__('New Link'), array('controller' => 'links', 'action' => 'add')); ?>
    • +
+
+
From cac0675e4feefad8c0ba6463e1e9c98490dc5622 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Sat, 30 Aug 2014 05:59:30 +0000 Subject: [PATCH 04/53] tochuu --- Controller/LinksAppController.php | 16 +++- Controller/LinksController.php | 22 +++++- .../Controller/LinksAppControllerTest.php | 7 ++ Test/Case/Controller/LinksControllerTest.php | 16 ++-- View/Elements/header_buttons.ctp | 42 ++++++++++ View/Elements/link_list.ctp | 78 +++++++++++++++++++ View/Links/setting_mode/index.ctp | 8 ++ View/Links/view/index.ctp | 2 + webroot/js/links.js | 19 +++++ 9 files changed, 198 insertions(+), 12 deletions(-) create mode 100644 Test/Case/Controller/LinksAppControllerTest.php create mode 100644 View/Elements/header_buttons.ctp create mode 100644 View/Elements/link_list.ctp create mode 100644 View/Links/setting_mode/index.ctp create mode 100644 View/Links/view/index.ctp create mode 100644 webroot/js/links.js diff --git a/Controller/LinksAppController.php b/Controller/LinksAppController.php index 3affb42..2f294a0 100644 --- a/Controller/LinksAppController.php +++ b/Controller/LinksAppController.php @@ -2,6 +2,20 @@ App::uses('AppController', 'Controller'); -class LinksAppController extends AppController { +class LinksAppController extends NetCommonsFrameAppController { +/** + * フレーム初期化 + * + * @param int $frameId frames.id + * @param string $lang language + * @return CakeResponse + */ + protected function _init($frameId, $lang) { + //フレーム初期化処理 + if (! $this->_initializeFrame($frameId, $lang)) { + $this->response->statusCode(400); + return $this->render(false); + } + } } diff --git a/Controller/LinksController.php b/Controller/LinksController.php index 0dcdd9f..8c34fc7 100644 --- a/Controller/LinksController.php +++ b/Controller/LinksController.php @@ -12,6 +12,10 @@ */ class LinksController extends LinksAppController { + public $uses = array( + 'Links.Link', + ); + /** * Components * @@ -20,13 +24,25 @@ class LinksController extends LinksAppController { public $components = array('Paginator'); /** - * index method + * index * + * @param int $frameId frame.id + * @param string $lang languge_id * @return void */ - public function index() { + public function index($frameId = 0, $lang = '') { + $this->_init($frameId, $lang); + $this->Link->recursive = 0; - $this->set('linkLists', $this->Paginator->paginate()); + $this->set('links', $this->Paginator->paginate()); + + if (Configure::read('Pages.isSetting')) { + $this->render('Links/setting_mode/index'); + // 編集権限があり、セッティングモードON⇒index/edit.ctpでrenderする + } else { + // 編集権限があり、セッティングモードOFF⇒index/latest.ctpでrenderする + $this->render('Links/view/index'); + } } /** diff --git a/Test/Case/Controller/LinksAppControllerTest.php b/Test/Case/Controller/LinksAppControllerTest.php new file mode 100644 index 0000000..1c769ab --- /dev/null +++ b/Test/Case/Controller/LinksAppControllerTest.php @@ -0,0 +1,7 @@ + + * @author SkeletonAuthorName + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License + * @copyright Copyright 2014, NetCommons Project + * @package app.Plugin.Notepads.View.Elements.index + */ +?> +

ボタンだよ

+
+ + + + + + + + + + + +
+ diff --git a/View/Elements/link_list.ctp b/View/Elements/link_list.ctp new file mode 100644 index 0000000..7fed3b9 --- /dev/null +++ b/View/Elements/link_list.ctp @@ -0,0 +1,78 @@ +
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Paginator->sort('id'); ?>Paginator->sort('links_block_id'); ?>Paginator->sort('status'); ?>Paginator->sort('language_id'); ?>Paginator->sort('is_auto_translated'); ?>Paginator->sort('translation_engine'); ?>Paginator->sort('links_category_id'); ?>Paginator->sort('title'); ?>Paginator->sort('url'); ?>Paginator->sort('description'); ?>Paginator->sort('created_user'); ?>Paginator->sort('created'); ?>Paginator->sort('modified_user'); ?>Paginator->sort('modified'); ?>
  + Html->link($link['LinksBlock']['id'], array('controller' => 'links_blocks', 'action' => 'view', $link['LinksBlock']['id'])); ?> +   + Html->link($link['Language']['id'], array('controller' => 'languages', 'action' => 'view', $link['Language']['id'])); ?> +    + Html->link($link['LinksCategory']['title'], array('controller' => 'links_categories', 'action' => 'view', $link['LinksCategory']['id'])); ?> +         + Html->link(__('View'), array('action' => 'view', $link['Link']['id'])); ?> + Html->link(__('Edit'), array('action' => 'edit', $link['Link']['id'])); ?> + Form->postLink(__('Delete'), array('action' => 'delete', $link['Link']['id']), null, __('Are you sure you want to delete # %s?', $link['Link']['id'])); ?> +
+

+ Paginator->counter(array( + 'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}') + )); + ?>

+
+ Paginator->prev('< ' . __('previous'), array(), null, array('class' => 'prev disabled')); + echo $this->Paginator->numbers(array('separator' => '')); + echo $this->Paginator->next(__('next') . ' >', array(), null, array('class' => 'next disabled')); + ?> +
+
+
+

+
    +
  • Html->link(__('New Link'), array('action' => 'add')); ?>
    • +
  • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Links Categories'), array('controller' => 'links_categories', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Links Category'), array('controller' => 'links_categories', 'action' => 'add')); ?>
    • +
  • Html->link(__('List Blocks'), array('controller' => 'blocks', 'action' => 'index')); ?>
    • +
  • Html->link(__('New Block'), array('controller' => 'blocks', 'action' => 'add')); ?>
    • +
+
diff --git a/View/Links/setting_mode/index.ctp b/View/Links/setting_mode/index.ctp new file mode 100644 index 0000000..2f5541e --- /dev/null +++ b/View/Links/setting_mode/index.ctp @@ -0,0 +1,8 @@ +Html->script('/links/js/links.js'); ?> +
+ +element('header_buttons'); +echo $this->element('link_list'); +?> +
diff --git a/View/Links/view/index.ctp b/View/Links/view/index.ctp new file mode 100644 index 0000000..f38627f --- /dev/null +++ b/View/Links/view/index.ctp @@ -0,0 +1,2 @@ +element('link_list'); \ No newline at end of file diff --git a/webroot/js/links.js b/webroot/js/links.js new file mode 100644 index 0000000..571f68e --- /dev/null +++ b/webroot/js/links.js @@ -0,0 +1,19 @@ +NetCommonsApp.controller('Links', + function($scope , $http, $sce, $timeout) { + /** + * ヘッダーボタン + * + * @type {boolean} + */ + $scope.sendLock = false; + + + /** + * display header button + * + * @type {boolean} + */ + $scope.displayHeaderBtn = true; + + } +) \ No newline at end of file From 828470d9f6b11ac874dee0cfe497bcf00ed97599 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Sat, 30 Aug 2014 07:54:50 +0000 Subject: [PATCH 05/53] add --- Controller/LinksAppController.php | 1 + Controller/LinksController.php | 2 + View/Elements/form_buttons.ctp | 62 +++++++++ View/Elements/header_buttons.ctp | 4 +- View/Elements/link_form.ctp | 39 ++++++ View/Elements/link_list.ctp | 140 +++++++++---------- View/Links/setting_mode/index.ctp | 26 +++- webroot/js/links.js | 214 ++++++++++++++++++++++++++++++ 8 files changed, 410 insertions(+), 78 deletions(-) create mode 100644 View/Elements/form_buttons.ctp create mode 100644 View/Elements/link_form.ctp diff --git a/Controller/LinksAppController.php b/Controller/LinksAppController.php index 2f294a0..c61903a 100644 --- a/Controller/LinksAppController.php +++ b/Controller/LinksAppController.php @@ -1,6 +1,7 @@ request->data); + if ($this->request->is('post')) { $this->Link->create(); if ($this->Link->save($this->request->data)) { diff --git a/View/Elements/form_buttons.ctp b/View/Elements/form_buttons.ctp new file mode 100644 index 0000000..f8d968c --- /dev/null +++ b/View/Elements/form_buttons.ctp @@ -0,0 +1,62 @@ + + * @author SkeletonAuthorName + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License + * @copyright Copyright 2014, NetCommons Project + * @package app.Plugin.AccessCounters.View.Elements.setting + */ +?> + +
+ + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/View/Elements/header_buttons.ctp b/View/Elements/header_buttons.ctp index 96f331d..081fce1 100644 --- a/View/Elements/header_buttons.ctp +++ b/View/Elements/header_buttons.ctp @@ -23,9 +23,9 @@ diff --git a/View/Elements/link_form.ctp b/View/Elements/link_form.ctp new file mode 100644 index 0000000..95f292d --- /dev/null +++ b/View/Elements/link_form.ctp @@ -0,0 +1,39 @@ + + * @author SkeletonAuthorName + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License + * @copyright Copyright 2014, NetCommons Project + * @package app.Plugin.AccessCounters.View.Elements.index + */ +?> + + + +element('form_buttons'); +?> diff --git a/View/Elements/link_list.ctp b/View/Elements/link_list.ctp index 7fed3b9..4b40886 100644 --- a/View/Elements/link_list.ctp +++ b/View/Elements/link_list.ctp @@ -1,78 +1,68 @@ -
-

- - - - - - - - - - - - - - - - - - - +
+ + +
+

+
Paginator->sort('id'); ?>Paginator->sort('links_block_id'); ?>Paginator->sort('status'); ?>Paginator->sort('language_id'); ?>Paginator->sort('is_auto_translated'); ?>Paginator->sort('translation_engine'); ?>Paginator->sort('links_category_id'); ?>Paginator->sort('title'); ?>Paginator->sort('url'); ?>Paginator->sort('description'); ?>Paginator->sort('created_user'); ?>Paginator->sort('created'); ?>Paginator->sort('modified_user'); ?>Paginator->sort('modified'); ?>
- - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - -
  - Html->link($link['LinksBlock']['id'], array('controller' => 'links_blocks', 'action' => 'view', $link['LinksBlock']['id'])); ?> -   - Html->link($link['Language']['id'], array('controller' => 'languages', 'action' => 'view', $link['Language']['id'])); ?> -    - Html->link($link['LinksCategory']['title'], array('controller' => 'links_categories', 'action' => 'view', $link['LinksCategory']['id'])); ?> -         - Html->link(__('View'), array('action' => 'view', $link['Link']['id'])); ?> - Html->link(__('Edit'), array('action' => 'edit', $link['Link']['id'])); ?> - Form->postLink(__('Delete'), array('action' => 'delete', $link['Link']['id']), null, __('Are you sure you want to delete # %s?', $link['Link']['id'])); ?> - Paginator->sort('id'); ?>Paginator->sort('links_block_id'); ?>Paginator->sort('status'); ?>Paginator->sort('language_id'); ?>Paginator->sort('is_auto_translated'); ?>Paginator->sort('translation_engine'); ?>Paginator->sort('links_category_id'); ?>Paginator->sort('title'); ?>Paginator->sort('url'); ?>Paginator->sort('description'); ?>Paginator->sort('created_user'); ?>Paginator->sort('created'); ?>Paginator->sort('modified_user'); ?>Paginator->sort('modified'); ?>
-

- Paginator->counter(array( - 'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}') - )); - ?>

-
- Paginator->prev('< ' . __('previous'), array(), null, array('class' => 'prev disabled')); - echo $this->Paginator->numbers(array('separator' => '')); - echo $this->Paginator->next(__('next') . ' >', array(), null, array('class' => 'next disabled')); - ?> + + +   + + Html->link($link['LinksBlock']['id'], array('controller' => 'links_blocks', 'action' => 'view', $link['LinksBlock']['id'])); ?> + +   + + Html->link($link['Language']['id'], array('controller' => 'languages', 'action' => 'view', $link['Language']['id'])); ?> + +   +   + + Html->link($link['LinksCategory']['title'], array('controller' => 'links_categories', 'action' => 'view', $link['LinksCategory']['id'])); ?> + +   +   +   +   +   +   +   + + Html->link(__('View'), array('action' => 'view', $link['Link']['id'])); ?> + Html->link(__('Edit'), array('action' => 'edit', $link['Link']['id'])); ?> + Form->postLink(__('Delete'), array('action' => 'delete', $link['Link']['id']), null, __('Are you sure you want to delete # %s?', $link['Link']['id'])); ?> + + + + +

+ Paginator->counter(array( + 'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}') + )); + ?>

+
+ Paginator->prev('< ' . __('previous'), array(), null, array('class' => 'prev disabled')); + echo $this->Paginator->numbers(array('separator' => '')); + echo $this->Paginator->next(__('next') . ' >', array(), null, array('class' => 'next disabled')); + ?> +
-
-
-

-
    -
  • Html->link(__('New Link'), array('action' => 'add')); ?>
    • -
  • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
    • -
  • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
    • -
  • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
    • -
  • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
    • -
  • Html->link(__('List Links Categories'), array('controller' => 'links_categories', 'action' => 'index')); ?>
    • -
  • Html->link(__('New Links Category'), array('controller' => 'links_categories', 'action' => 'add')); ?>
    • -
  • Html->link(__('List Blocks'), array('controller' => 'blocks', 'action' => 'index')); ?>
    • -
  • Html->link(__('New Block'), array('controller' => 'blocks', 'action' => 'add')); ?>
    • -
-
+ \ No newline at end of file diff --git a/View/Links/setting_mode/index.ctp b/View/Links/setting_mode/index.ctp index 2f5541e..a0dc1e8 100644 --- a/View/Links/setting_mode/index.ctp +++ b/View/Links/setting_mode/index.ctp @@ -1,8 +1,32 @@ + Html->script('/links/js/links.js'); ?> -
+
+ + element('header_buttons'); echo $this->element('link_list'); + ?> + element('index/preview'); + + //状態ラベルの表示 +// echo $this->element('index/status_label'); + + //入力フォームの表示 + echo $this->element('link_form'); + + ?> + + +
diff --git a/webroot/js/links.js b/webroot/js/links.js index 571f68e..ec8928c 100644 --- a/webroot/js/links.js +++ b/webroot/js/links.js @@ -15,5 +15,219 @@ NetCommonsApp.controller('Links', */ $scope.displayHeaderBtn = true; + + /** + * input form object + * + * @type {{display: boolean, + * title: string, + * content: content, + * button: boolean}} + */ + $scope.Form = { + 'display': false, + 'title': '', + 'url' : '', + 'description' : '', + 'button': false + }; + + /** + * content object + * + * @type {{display: boolean}} + */ + $scope.Content = { + 'display': true + }; + + /** + * Notepad plugin URL + * + * @const + */ + $scope.PLUGIN_URL = '/links/links/'; + + /** + * post url + * + * @const + */ + $scope.POST_FORM_URL = $scope.PLUGIN_URL + 'add/'; + + /** + * result message id attribute + * + * @type {sring} + */ + $scope.contentAttrId = ''; + + /** + * input form id attribute + * + * @type {sring} + */ + $scope.inputFormAttrId = ''; + + /** + * input form id attribute + * + * @const + */ + $scope.INPUT_FORM_ATTR_ID = '#nc-links-input-form-'; + + /** + * Initialize + * + * @return {void} + */ + $scope.initialize = function(notepad, frameId) { +// $scope.notepad = notepad; + $scope.frameId = frameId; + + //入力フォームid属性のセット + $scope.inputFormAttrId = $scope.INPUT_FORM_ATTR_ID + $scope.frameId; + +// //POSTフォームid属性のセット +// $scope.postFormAttrId = $scope.POST_FORM_ATTR_ID + $scope.frameId; +// //POSTフォームエリアid属性のセット +// $scope.postFormAreaAttrId = $scope.POST_FORM_ATTR_ID + +// 'area-' + $scope.frameId; + +// //登録処理結果メッセージのid属性のセット +// $scope.resultMessageAttrId = +// $scope.RESULT_MESSAGE_ATTR_ID + $scope.frameId; +// +// //コンテンツのid属性のセット +// $scope.ContentAttrId = $scope.CONTENT_ATTR_ID + $scope.frameId; + + $scope.Content.display = true; + + }; + + /** + * show setting form + * + * @return {void} + */ + $scope.showAddForm = function() { + /** + * 1．フォームを表示する $scope.GET_FORM_URL = $scope.PLUGIN_URL + 'form/'; + * 2．編集・ブロックセッティングのボタンを隠す + * 3．コンテンツを隠す + */ + $scope.Form.display = true; + $scope.displayHeaderBtn = false; + $scope.Form.button = true; + $scope.Content.display = false; + +// //メッセージの初期化 +// $($scope.resultMessageAttrId) +// .removeClass('alert-danger') +// .removeClass('alert-success'); +// $($scope.resultMessageAttrId + ' .message').html(' '); +// +// //POSTフォームエリアの内容をクリア +// $($scope.postFormAreaAttrId).html(' '); + }; + + + /** + * post + * 1: Publish + * 2: Approve + * 3: Draft + * 4: Disapprove + * + * @param {string} status + * @return {void} + */ +// $scope.post = function(postStatus) { +// //$scope.sendLock = true; +// +// $http.get($scope.GET_FORM_URL + +// $scope.frameId + '/' + +// $scope.notepad.Notepad.language_id + '/' + Math.random()) +// .success(function(data, status, headers, config) { +// //POST用のフォームセット +// $($scope.postFormAreaAttrId).html(data); +// //ステータスのセット +// $($scope.postFormAttrId + +// ' select[name="data[Notepad][status]"]').val(postStatus); +// +// var postParams = {}; +// //POSTフォームのシリアライズ +// var postSerialize = +// $($scope.postFormAttrId).serializeArray(); +// var length = postSerialize.length; +// for (var i = 0; i < length; i++) { +// postParams[postSerialize[i]['name']] = +// postSerialize[i]['value']; +// } +// +// //入力フォームのシリアライズ +// var inputSerialize = +// $($scope.inputFormAttrId).serializeArray(); +// var length = inputSerialize.length; +// for (var i = 0; i < length; i++) { +// postParams[inputSerialize[i]['name']] = +// inputSerialize[i]['value']; +// } +// +// //登録情報をPOST +// $scope.sendPost(postParams); +// }) +// .error(function(data, status, headers, config) { +// //keyの取得に失敗 +// if (! data) { data = 'error'; } +// $scope.showResult('error', data); +// }); +// }; + + + $scope.post = function(postStatus) { + var postParams = {}; + + //入力フォームのシリアライズ + var inputSerialize = + $($scope.inputFormAttrId).serializeArray(); + var length = inputSerialize.length; + for (var i = 0; i < length; i++) { + postParams[inputSerialize[i]['name']] = + inputSerialize[i]['value']; + } + $scope.sendPost(postParams); + } + /** + * save + * + * @param {Object.} postParams + * @return {void} + */ + $scope.sendPost = function(postParams) { + $.ajax({ + method: 'POST' , + url: $scope.POST_FORM_URL + $scope.frameId + '/' + Math.random(), + data: postParams, + success: function(json, status, headers, config) { +// $scope.notepad = json.data; +// $($scope.contentAttrId + ' .nc-notepads-title') +// .html(json.data.Notepad.title); +// $($scope.contentAttrId + ' .nc-notepads-content') +// .html(json.data.Notepad.content); +// $scope.showResult('success', json.message); + }, + error: function(json, status, headers, config) { + if (! json.message) { + $scope.showResult('error', headers); + } else { + $scope.showResult('error', json.message); + } + } + }); + }; + } + + ) \ No newline at end of file From aa201e95c0818152c9232100a3c17bdcb5e85a92 Mon Sep 17 00:00:00 2001 From: vagrant Date: Sun, 31 Aug 2014 02:22:39 +0000 Subject: [PATCH 06/53] sonobashinogi --- Controller/LinksController.php | 3 ++ Test/Case/View/Helper/LinksFormHelperTest.php | 50 +++++++++++++++++++ View/Elements/link_form.ctp | 11 ++-- View/Helper/LinksFormHelper.php | 42 ++++++++++++++++ 4 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 Test/Case/View/Helper/LinksFormHelperTest.php create mode 100644 View/Helper/LinksFormHelper.php diff --git a/Controller/LinksController.php b/Controller/LinksController.php index 0ed5266..195bbba 100644 --- a/Controller/LinksController.php +++ b/Controller/LinksController.php @@ -1,5 +1,6 @@ + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('View', 'View'); +App::uses('Helper', 'View'); +App::uses('LinksFormHelper', 'Links.View/Helper'); + +/** + * Summary for LinksFormHelper Test Case + */ +class LinksFormHelperTest extends CakeTestCase { + +/** + * setUp method + * + * @return void + */ + public function setUp() { + parent::setUp(); + $View = new View(); + $this->LinksForm = new LinksFormHelper($View); + } + +/** + * Fake + * + * @return void + */ + public function testFake() { + //fake + } + +/** + * tearDown method + * + * @return void + */ + public function tearDown() { + unset($this->LinksForm); + + parent::tearDown(); + } + +} diff --git a/View/Elements/link_form.ctp b/View/Elements/link_form.ctp index 95f292d..1bbbc56 100644 --- a/View/Elements/link_form.ctp +++ b/View/Elements/link_form.ctp @@ -16,16 +16,21 @@ ng-show="Form.display"> '', + 'url' => '', + 'description' => '', + ); // タイトル(text ng-model=Form.title)、 - echo $this->Form->input('Link.title', + echo $this->LinksForm->input('Link.title', array('ng-init' =>'Form.title=\''. $links['Link']['title'].'\'', 'ng-model' => 'Form.title')); - echo $this->Form->input('Link.url', + echo $this->LinksForm->input('Link.url', array('ng-init' =>'Form.url=\''. $links['Link']['url'].'\'', 'ng-model' => 'Form.url')); - echo $this->Form->input('Link.description', + echo $this->LinksForm->input('Link.description', array('ng-init' =>'Form.description=\''. $links['Link']['description'].'\'', 'ng-model' => 'Form.description', 'type' => 'textarea')); diff --git a/View/Helper/LinksFormHelper.php b/View/Helper/LinksFormHelper.php new file mode 100644 index 0000000..8d452b8 --- /dev/null +++ b/View/Helper/LinksFormHelper.php @@ -0,0 +1,42 @@ + Date: Tue, 9 Sep 2014 18:54:29 +0900 Subject: [PATCH 07/53] Modified constant value --- Model/Link.php | 28 ++++++++++++++++++++++++++++ View/Elements/form_buttons.ctp | 8 ++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/Model/Link.php b/Model/Link.php index be27271..6ca9b66 100644 --- a/Model/Link.php +++ b/Model/Link.php @@ -19,6 +19,34 @@ */ class Link extends LinksAppModel { +/** + * Link status publish + * + * @var int + */ + const STATUS_PUBLISHED = '1'; + +/** + * Link status approval + * + * @var int + */ + const STATUS_APPROVED = '2'; + +/** + * Link status draft + * + * @var int + */ + const STATUS_DRAFTED = '3'; + +/** + * Link status disapproval + * + * @var int + */ + const STATUS_DISAPPROVED = '4'; + /** * Use database config * diff --git a/View/Elements/form_buttons.ctp b/View/Elements/form_buttons.ctp index f8d968c..c18515e 100644 --- a/View/Elements/form_buttons.ctp +++ b/View/Elements/form_buttons.ctp @@ -32,14 +32,14 @@ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
From ebccd537d889353d7be4f8c501e0b4bc7823abf8 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 12 Sep 2014 16:15:23 +0900 Subject: [PATCH 10/53] Initialize commit --- View/Links/index.ctp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/View/Links/index.ctp b/View/Links/index.ctp index 3368ed5..3a17275 100644 --- a/View/Links/index.ctp +++ b/View/Links/index.ctp @@ -49,7 +49,7 @@


-
    +
    • カテゴリ１
    • NetCommons2公式サイト 42
    • NetCommons Legacy 42
      • From 85bdc5da7814433e15eca9c708e52641d1ff3f7f Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 19 Sep 2014 21:56:46 +0900 Subject: [PATCH 11/53] Initialize commit --- Controller/LinksAppController.php | 4 +- Controller/LinksController.php | 43 ++++++++- View/Elements/Links/dropdown.ctp | 38 ++++++++ View/Elements/Links/header_button.ctp | 43 +++++++++ View/Elements/Links/index_edit.ctp | 4 + View/Elements/Links/index_link_add.ctp | 15 +++ View/Elements/Links/index_manage.ctp | 3 + View/Elements/Links/list.ctp | 31 +++++++ View/Links/index.ctp | 121 ++++++++----------------- webroot/js/links.js | 50 ++++++++++ 10 files changed, 265 insertions(+), 87 deletions(-) create mode 100644 View/Elements/Links/dropdown.ctp create mode 100644 View/Elements/Links/header_button.ctp create mode 100644 View/Elements/Links/index_edit.ctp create mode 100644 View/Elements/Links/index_link_add.ctp create mode 100644 View/Elements/Links/index_manage.ctp create mode 100644 View/Elements/Links/list.ctp create mode 100644 webroot/js/links.js diff --git a/Controller/LinksAppController.php b/Controller/LinksAppController.php index 8f78019..eac6c28 100644 --- a/Controller/LinksAppController.php +++ b/Controller/LinksAppController.php @@ -10,7 +10,7 @@ */ App::uses('AppController', 'Controller'); -//App::uses('NetCommonsFrameAppController', 'NetCommons.Controller'); +App::uses('NetCommonsFrameAppController', 'NetCommons.Controller'); /** * LinksApp Controller @@ -18,7 +18,7 @@ * @author Shohei Nakajima * @package NetCommons\Links\Controller */ -class LinksAppController extends AppController { +class LinksAppController extends NetCommonsFrameAppController { /** * use component diff --git a/Controller/LinksController.php b/Controller/LinksController.php index 202397a..26139ec 100644 --- a/Controller/LinksController.php +++ b/Controller/LinksController.php @@ -50,10 +50,51 @@ public function beforeFilter() { * @param string $lang ex)"en" or "ja" etc. * @return CakeResponse A response object containing the rendered view. */ - public function index($frameId = 0, $lang = '') { + public function index($frameId = 0, $type = 'dropdown') { + $this->_initializeFrame($frameId); + $this->set('type', $type); return $this->render('Links/index'); } +/** + * index method + * + * @param int $frameId frames.id + * @param string $lang ex)"en" or "ja" etc. + * @return CakeResponse A response object containing the rendered view. + */ + public function index_link_add($frameId = 0) { + $this->_initializeFrame($frameId); + $this->layout = false; + return $this->render('Links/index_link_add'); + } + +/** + * index method + * + * @param int $frameId frames.id + * @param string $lang ex)"en" or "ja" etc. + * @return CakeResponse A response object containing the rendered view. + */ + public function index_edit($frameId = 0) { + $this->_initializeFrame($frameId); + $this->layout = false; + return $this->render('Links/index_edit'); + } + +/** + * index method + * + * @param int $frameId frames.id + * @param string $lang ex)"en" or "ja" etc. + * @return CakeResponse A response object containing the rendered view. + */ + public function index_manage($frameId = 0) { + $this->_initializeFrame($frameId); + $this->layout = false; + return $this->render('Links/index_manage'); + } + /** * view method * diff --git a/View/Elements/Links/dropdown.ctp b/View/Elements/Links/dropdown.ctp new file mode 100644 index 0000000..44fe906 --- /dev/null +++ b/View/Elements/Links/dropdown.ctp @@ -0,0 +1,38 @@ + + +
      + + +
      diff --git a/View/Elements/Links/header_button.ctp b/View/Elements/Links/header_button.ctp new file mode 100644 index 0000000..9931d1a --- /dev/null +++ b/View/Elements/Links/header_button.ctp @@ -0,0 +1,43 @@ +
      + +
      + +
      + + + + + + + + + +
      diff --git a/View/Elements/Links/index_edit.ctp b/View/Elements/Links/index_edit.ctp new file mode 100644 index 0000000..b75755d --- /dev/null +++ b/View/Elements/Links/index_edit.ctp @@ -0,0 +1,4 @@ + +
      + index_edit +
      \ No newline at end of file diff --git a/View/Elements/Links/index_link_add.ctp b/View/Elements/Links/index_link_add.ctp new file mode 100644 index 0000000..f769535 --- /dev/null +++ b/View/Elements/Links/index_link_add.ctp @@ -0,0 +1,15 @@ +view_add
      +view_add
      +view_add
      +view_add
      +view_add
      +view_add
      +view_add
      +view_add
      +view_add
      +view_add
      +view_add
      +view_add
      +view_add
      +view_add
      +view_add
      diff --git a/View/Elements/Links/index_manage.ctp b/View/Elements/Links/index_manage.ctp new file mode 100644 index 0000000..5c77a41 --- /dev/null +++ b/View/Elements/Links/index_manage.ctp @@ -0,0 +1,3 @@ +
      + index_manage +
      \ No newline at end of file diff --git a/View/Elements/Links/list.ctp b/View/Elements/Links/list.ctp new file mode 100644 index 0000000..c915b5d --- /dev/null +++ b/View/Elements/Links/list.ctp @@ -0,0 +1,31 @@ + +
      + +
      diff --git a/View/Links/index.ctp b/View/Links/index.ctp index 3a17275..db43ae0 100644 --- a/View/Links/index.ctp +++ b/View/Links/index.ctp @@ -1,87 +1,40 @@ +Html->script('/links/js/links.js'); ?> + + + + - @@ -76,6 +77,7 @@ @@ -93,6 +95,7 @@
      diff --git a/View/Elements/Links/content_edit_btn.ctp b/View/Elements/Links/content_edit_btn.ctp index 28ab992..893f9c7 100644 --- a/View/Elements/Links/content_edit_btn.ctp +++ b/View/Elements/Links/content_edit_btn.ctp @@ -1,7 +1,13 @@ -
      +
      + + + + diff --git a/View/Elements/Links/display_style_setting.ctp b/View/Elements/Links/display_style_setting.ctp index 81cad92..91153ed 100644 --- a/View/Elements/Links/display_style_setting.ctp +++ b/View/Elements/Links/display_style_setting.ctp @@ -1,95 +1,98 @@ +
      +
      +
      + Form->label('display_type', __('表示方法変更')); -
      - Form->label('display_type', __('表示方法変更')); + echo $this->Form->input('display_type', array( + //'label' => false, + //'label' => true, + 'legend' => false, + 'type' => 'radio', + 'options' => array( + 0 => 'ドロップダウンで表示する', + 1 => '一覧で表示する(説明なし)', + 2 => '一覧で表示する(説明付き)', + ), + //'before' => '
      ' + 'separator' => '
      ', + 'after' => '
      ', + 'selected' => 0, + 'div' => array('class' => 'input radio', 'style' => 'margin-left: 30px;'), + //'class' => 'form-control', + ) + ); + ?> +
      - echo $this->Form->input('display_type', array( - //'label' => false, - //'label' => true, - 'legend' => false, - 'type' => 'radio', - 'options' => array( - 0 => 'ドロップダウンで表示する', - 1 => '一覧で表示する(説明なし)', - 2 => '一覧で表示する(説明付き)', - ), - //'before' => '
      ' - 'separator' => '
      ', - //'selected' => 0, - 'div' => array('class' => 'input radio', 'style' => 'margin-left: 30px;'), - //'class' => 'form-control', - ) - ); - ?> -
      - -
      - Form->input('click_open_window', array( - //'label' => false, - 'type' => 'checkbox', - 'label' => 'リンクをクリック時、新規ウィンドウで表示する', - 'div' => array('class' => 'bold', 'style' => 'margin-left: 0px;'), - 'checked' => true, - ) - ); - ?> -
      +
      + Form->input('click_open_window', array( + //'label' => false, + 'type' => 'checkbox', + 'label' => 'リンクをクリック時、新規ウィンドウで表示する', + 'div' => array('class' => 'bold', 'style' => 'margin-left: 0px;'), + 'checked' => true, + ) + ); + ?> +
      -
      - Form->input('click_count', array( - //'label' => false, - 'type' => 'checkbox', - 'label' => 'リンク先参照回数を表示する', - 'div' => array('class' => 'bold', 'style' => 'margin-left: 0px;'), - 'checked' => true, - ) - ); - ?> -
      +
      + Form->input('click_count', array( + //'label' => false, + 'type' => 'checkbox', + 'label' => 'リンク先参照回数を表示する', + 'div' => array('class' => 'bold', 'style' => 'margin-left: 0px;'), + 'checked' => true, + ) + ); + ?> +
      -
      - Form->label('category_separater', __('カテゴリ間の区切り線')); +
      + Form->label('category_separater', __('カテゴリ間の区切り線')); - echo $this->Form->input('category_separater', array( - 'label' => false, - 'type' => 'textarea', - 'rows' => 2, - 'value' => '', - 'class' => 'form-control', - ) - ); - ?> -
      + echo $this->Form->input('category_separater', array( + 'label' => false, + 'type' => 'textarea', + 'rows' => 2, + 'value' => '', + 'class' => 'form-control', + ) + ); + ?> +
      -
      - Form->label('list_marker', __('リストマーカー')); +
      + Form->label('list_marker', __('リストマーカー')); - echo $this->Form->input('list_marker', array( - 'label' => false, - 'type' => 'textarea', - 'rows' => 2, - 'value' => '', - 'class' => 'form-control', - ) - ); - ?> + echo $this->Form->input('list_marker', array( + 'label' => false, + 'type' => 'textarea', + 'rows' => 2, + 'value' => '', + 'class' => 'form-control', + ) + ); + ?> +
      +
      - -

      - - -

      +

      + + +

      diff --git a/View/Elements/Links/header_button.ctp b/View/Elements/Links/header_button.ctp index dbd5420..d0a76d8 100644 --- a/View/Elements/Links/header_button.ctp +++ b/View/Elements/Links/header_button.ctp @@ -1,44 +1,57 @@ +
      -
      +
      diff --git a/View/Elements/Links/index_edit.ctp b/View/Elements/Links/index_edit.ctp index 23803f2..af7ce56 100644 --- a/View/Elements/Links/index_edit.ctp +++ b/View/Elements/Links/index_edit.ctp @@ -50,6 +50,7 @@
      @@ -68,6 +69,7 @@
      @@ -83,6 +85,7 @@
      diff --git a/View/Links/index.ctp b/View/Links/index.ctp index ef3b426..179b820 100644 --- a/View/Links/index.ctp +++ b/View/Links/index.ctp @@ -37,4 +37,3 @@
      - From f5e921a9ea7a6b6026ea9b6bfbd4052d921b7160 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 24 Sep 2014 13:55:02 +0900 Subject: [PATCH 15/53] Initialize commit --- View/Elements/Links/header_button.ctp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/View/Elements/Links/header_button.ctp b/View/Elements/Links/header_button.ctp index d0a76d8..ab322c4 100644 --- a/View/Elements/Links/header_button.ctp +++ b/View/Elements/Links/header_button.ctp @@ -27,8 +27,8 @@ ng-show="visibleEdit" tooltip="編集終了"> -
      +
      + +
      + Form->label('category_name', __('カテゴリー名')); + + echo $this->Form->input('category_name', array( + 'label' => false, + 'type' => 'text', + 'class' => 'form-control', + ) + ); + ?> +
      + +

      + + +

      + +
      +
      +
      + +
      + diff --git a/View/Elements/Links/index_add_link.ctp b/View/Elements/Links/index_add_link.ctp new file mode 100644 index 0000000..5905079 --- /dev/null +++ b/View/Elements/Links/index_add_link.ctp @@ -0,0 +1,113 @@ +
      + Form->label('link_url', __('リンクURL')); + + echo $this->Form->input('link_url', array( + 'label' => false, + 'type' => 'text', + 'class' => 'form-control', + ) + ); + ?> +
      + +
      + +
      + +
      + Form->label('category', __('カテゴリー')); + + echo $this->Form->input('category', array( + 'label' => false, + 'type' => 'select', + 'options' => array(1 => 'カテゴリー1', '2' => 'カテゴリー2', '3' => 'カテゴリー3'), + 'selected' => 1, + 'class' => 'form-control', + ) + ); + ?> + +
      +
      +
      + + +
      + +
      + +
      +
      +
      + +
      + +
      + Form->label('tittle', __('タイトル')); + + echo $this->Form->input('tittle', array( + 'label' => false, + 'type' => 'text', + 'class' => 'form-control', + ) + ); + ?> +
      + + +
      + Form->label('tittle', __('説明')); + + echo $this->Form->input('tittle', array( + 'label' => false, + 'type' => 'textarea', + 'rows' => 2, + 'class' => 'form-control', + ) + ); + ?> +
      + + + +

      + + + +

      diff --git a/View/Elements/Links/index_link_add.ctp b/View/Elements/Links/index_link_add.ctp deleted file mode 100644 index f769535..0000000 --- a/View/Elements/Links/index_link_add.ctp +++ /dev/null @@ -1,15 +0,0 @@ -view_add
      -view_add
      -view_add
      -view_add
      -view_add
      -view_add
      -view_add
      -view_add
      -view_add
      -view_add
      -view_add
      -view_add
      -view_add
      -view_add
      -view_add
      diff --git a/View/Links/index.ctp b/View/Links/index.ctp index 179b820..a15a0de 100644 --- a/View/Links/index.ctp +++ b/View/Links/index.ctp @@ -1,14 +1,51 @@ Html->script('/links/js/links.js'); ?> - - element('Links/content_edit_btn', array('published' => false, 'size' => 4)); ?> + element('Links/content_edit_btn_category', array('published' => false, 'size' => 4)); ?>
      @@ -28,7 +28,13 @@ カテゴリ２ - element('Links/content_edit_btn', array('published' => false, 'size' => 4)); ?> + element('Links/content_edit_btn_category', array('published' => false, 'size' => 4)); ?> + +

      + +

      diff --git a/View/Elements/Links/change_order.ctp b/View/Elements/Links/change_order.ctp index c9c2282..838baed 100644 --- a/View/Elements/Links/change_order.ctp +++ b/View/Elements/Links/change_order.ctp @@ -17,7 +17,7 @@ - element('Links/content_edit_btn', array('published' => false, 'size' => 3)); ?> + element('Links/content_edit_btn_link', array('published' => false, 'size' => 3)); ?> @@ -37,7 +37,7 @@ - element('Links/content_edit_btn', array('published' => false, 'size' => 3)); ?> + element('Links/content_edit_btn_link', array('published' => false, 'size' => 3)); ?> @@ -64,7 +64,7 @@ - element('Links/content_edit_btn', array('published' => true, 'size' => 3)); ?> + element('Links/content_edit_btn_link', array('published' => true, 'size' => 3)); ?> @@ -82,7 +82,7 @@ - element('Links/content_edit_btn', array('published' => false, 'size' => 3)); ?> + element('Links/content_edit_btn_link', array('published' => false, 'size' => 3)); ?> @@ -103,8 +103,14 @@ - element('Links/content_edit_btn', array('published' => false, 'size' => 3)); ?> + element('Links/content_edit_btn_link', array('published' => false, 'size' => 3)); ?> + +

      + +

      diff --git a/View/Elements/Links/content_edit_btn.ctp b/View/Elements/Links/content_edit_btn_category.ctp similarity index 100% rename from View/Elements/Links/content_edit_btn.ctp rename to View/Elements/Links/content_edit_btn_category.ctp diff --git a/View/Elements/Links/content_edit_btn_link.ctp b/View/Elements/Links/content_edit_btn_link.ctp new file mode 100644 index 0000000..654a9c7 --- /dev/null +++ b/View/Elements/Links/content_edit_btn_link.ctp @@ -0,0 +1,15 @@ +
      + + + + + + +
      diff --git a/View/Elements/Links/display_style_setting.ctp b/View/Elements/Links/display_style_setting.ctp index 3582892..072f643 100644 --- a/View/Elements/Links/display_style_setting.ctp +++ b/View/Elements/Links/display_style_setting.ctp @@ -88,12 +88,23 @@ -

      - - -

      + + + +

      + + +

      diff --git a/View/Elements/Links/header_button.ctp b/View/Elements/Links/header_button.ctp index 31e40d4..ddbead3 100644 --- a/View/Elements/Links/header_button.ctp +++ b/View/Elements/Links/header_button.ctp @@ -12,6 +12,7 @@
      + - - + - - +
      diff --git a/View/Elements/Links/index_add_link.ctp b/View/Elements/Links/index_add_link.ctp index 5905079..ebb0fd3 100644 --- a/View/Elements/Links/index_add_link.ctp +++ b/View/Elements/Links/index_add_link.ctp @@ -32,7 +32,7 @@ ) ); ?> - + diff --git a/View/Elements/Links/index_manage.ctp b/View/Elements/Links/index_manage.ctp index ce09e01..5d89a49 100644 --- a/View/Elements/Links/index_manage.ctp +++ b/View/Elements/Links/index_manage.ctp @@ -15,7 +15,7 @@
    • - 表示順変更 + リンク編集
    • @@ -49,7 +49,14 @@
      + + - - @@ -64,6 +43,28 @@ , )"> + + +
      element('Links/header_button'); ?> From 4ee234c6f1b10e019bda619c625ea3cbc45b0cf9 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 26 Sep 2014 15:35:56 +0900 Subject: [PATCH 19/53] Initialize commit --- View/Elements/Links/category_editor.ctp | 89 +++++++--- View/Elements/Links/change_order.ctp | 145 ++++++++++++---- .../Links/content_edit_btn_category.ctp | 4 +- View/Elements/Links/content_edit_btn_link.ctp | 8 +- View/Elements/Links/content_move_btn.ctp | 13 +- View/Elements/Links/index_add_link.ctp | 161 +++++++++--------- View/Elements/Links/index_manage.ctp | 24 ++- View/Links/index.ctp | 4 +- webroot/js/links.js | 38 ++++- 9 files changed, 323 insertions(+), 163 deletions(-) diff --git a/View/Elements/Links/category_editor.ctp b/View/Elements/Links/category_editor.ctp index 7a512dc..4e8edb2 100644 --- a/View/Elements/Links/category_editor.ctp +++ b/View/Elements/Links/category_editor.ctp @@ -1,40 +1,79 @@ -
      - -
      +
      +
      -
      +
      +
      + Form->input('category_name.0', array( + 'label' => false, + 'type' => 'text', + 'class' => 'form-control', + 'value' => '', + ) + ); + ?> -
      -
      - element('Links/content_move_btn', array('size' => 3)); ?> +
      +
      + +
      -
      - カテゴリ１ +
      +
      + +
      +
      + element('Links/content_move_btn', array('size' => '2 col-md-2', 'upDisabled' => true)); ?> + +
      + Form->input('category_name.1', array( + 'label' => false, + 'type' => 'text', + 'class' => 'form-control', + 'value' => 'カテゴリ１１１１１１', + ) + ); + ?>
      - element('Links/content_edit_btn_category', array('published' => false, 'size' => 4)); ?> + element('Links/content_edit_btn_category', array('published' => false, 'size' => '2 col-md-1')); ?>
      -
      -
      - element('Links/content_move_btn', array('size' => 3)); ?> +
      +
      + element('Links/content_move_btn', array('size' => '2 col-md-2', 'downDisabled' => true)); ?> -
      - カテゴリ２ +
      + Form->input('category_name.2', array( + 'label' => false, + 'type' => 'text', + 'class' => 'form-control', + 'value' => 'カテゴリ２２２２２２', + ) + ); + ?>
      - element('Links/content_edit_btn_category', array('published' => false, 'size' => 4)); ?> + element('Links/content_edit_btn_category', array('published' => false, 'size' => '2 col-md-1')); ?>
      -

      - -

      + +

      + + +

      diff --git a/View/Elements/Links/change_order.ctp b/View/Elements/Links/change_order.ctp index 838baed..23aef5d 100644 --- a/View/Elements/Links/change_order.ctp +++ b/View/Elements/Links/change_order.ctp @@ -4,40 +4,64 @@
      - element('Links/content_move_btn', array('size' => 1)); ?> + -
      + element('Links/content_move_btn', array('size' => '2 col-md-1', 'upDisabled' => true)); ?> + +
      - 本サイトは情報共有基盤システムNetCommonsの公式サイトです。 本サイトは国立情報学研究所NetCommonsプロジェクトにより運営されています。 +
      - element('Links/content_edit_btn_link', array('published' => false, 'size' => 3)); ?> + element('Links/content_edit_btn_link', array( + 'published' => false, + 'size' => 12, + 'url' => $url, + 'title' => $title, + 'description' => $description)); ?> +
      - element('Links/content_move_btn', array('size' => 1)); ?> + + + element('Links/content_move_btn', array('size' => '2 col-md-1')); ?> -
      +
      - 本サイトはe-ラーニング・情報共有の基盤として国立情報学研究所が提供しているNetCommonsの公式サイトです。 +
      - element('Links/content_edit_btn_link', array('published' => false, 'size' => 3)); ?> + element('Links/content_edit_btn_link', array( + 'published' => false, + 'size' => 12, + 'url' => $url, + 'title' => $title, + 'description' => $description)); ?> +
      @@ -50,67 +74,114 @@
      - element('Links/content_move_btn', array('size' => 1)); ?> -
      + + + element('Links/content_move_btn', array('size' => '2 col-md-1')); ?> + +
      - Researchmap is an information sharing platform for the researchers. Researchmap is provided by Japan +
      - element('Links/content_edit_btn_link', array('published' => true, 'size' => 3)); ?> + element('Links/content_edit_btn_link', array( + 'published' => true, + 'size' => 12, + 'url' => $url, + 'title' => $title, + 'description' => $description)); ?> +
      - element('Links/content_move_btn', array('size' => 1)); ?> -
      + + + element('Links/content_move_btn', array('size' => '2 col-md-1')); ?> + +
      +
      +
      - element('Links/content_edit_btn_link', array('published' => false, 'size' => 3)); ?> + element('Links/content_edit_btn_link', array( + 'published' => false, + 'size' => 12, + 'url' => $url, + 'title' => $title, + 'description' => $description)); ?> +
      - element('Links/content_move_btn', array('size' => 1)); ?> -
      + + + element('Links/content_move_btn', array('size' => '2 col-md-1', 'downDisabled' => true)); ?> + +
      - 国立情報学研究所は、情報学という新しい研究分野での「未来価値創成」を目指すわが国唯一の学術総合研究所として、ネットワーク、ソフトウェア、コンテンツなどの情報関連分野の新しい理論・方法論から応用展開までの研究開発を総合的に推進しています。 +
      - element('Links/content_edit_btn_link', array('published' => false, 'size' => 3)); ?> + element('Links/content_edit_btn_link', array( + 'published' => false, + 'size' => 12, + 'url' => $url, + 'title' => $title, + 'description' => $description)); ?> + +
      -

      - -

      + +

      + + +

      diff --git a/View/Elements/Links/content_edit_btn_category.ctp b/View/Elements/Links/content_edit_btn_category.ctp index 893f9c7..c968ca0 100644 --- a/View/Elements/Links/content_edit_btn_category.ctp +++ b/View/Elements/Links/content_edit_btn_category.ctp @@ -1,12 +1,14 @@ -
      +
      + + +
      + diff --git a/View/Elements/Links/content_move_btn.ctp b/View/Elements/Links/content_move_btn.ctp index c2d0af7..0ca1338 100644 --- a/View/Elements/Links/content_move_btn.ctp +++ b/View/Elements/Links/content_move_btn.ctp @@ -1,10 +1,17 @@ -
      - - + +
      + diff --git a/View/Elements/Links/index_add_link.ctp b/View/Elements/Links/index_add_link.ctp index ebb0fd3..8b0567a 100644 --- a/View/Elements/Links/index_add_link.ctp +++ b/View/Elements/Links/index_add_link.ctp @@ -1,91 +1,100 @@ -
      - Form->label('link_url', __('リンクURL')); +
      +
      +
      + Form->label('link_url', __('リンクURL')); + + echo $this->Form->input('link_url', array( + 'label' => false, + 'type' => 'text', + 'class' => 'form-control', + 'value' => '{{Form.link_url}}' + ) + ); + ?> +
      + +
      - echo $this->Form->input('link_url', array( - 'label' => false, - 'type' => 'text', - 'class' => 'form-control', - ) - ); - ?> -
      -
      -
      +
      + Form->label('category', __('カテゴリー')); -
      - Form->label('category', __('カテゴリー')); + echo $this->Form->input('category', array( + 'label' => false, + 'type' => 'select', + 'options' => array(1 => 'カテゴリー1', '2' => 'カテゴリー2', '3' => 'カテゴリー3'), + 'selected' => 1, + 'class' => 'form-control', + ) + ); + ?> + +
      ---> -
      +
      + Form->label('title', __('タイトル')); -
      - Form->label('tittle', __('タイトル')); + echo $this->Form->input('title', array( + 'label' => false, + 'type' => 'text', + 'class' => 'form-control', + 'value' => '{{Form.title}}' + ) + ); + ?> +
      - echo $this->Form->input('tittle', array( - 'label' => false, - 'type' => 'text', - 'class' => 'form-control', - ) - ); - ?> -
      +
      + Form->label('description', __('説明')); -
      - Form->label('tittle', __('説明')); + echo $this->Form->input('description', array( + 'label' => false, + 'type' => 'textarea', + 'rows' => 2, + 'class' => 'form-control', + 'value' => '{{Form.description}}' + ) + ); + ?> +
      - echo $this->Form->input('tittle', array( - 'label' => false, - 'type' => 'textarea', - 'rows' => 2, - 'class' => 'form-control', - ) - ); - ?>
      +
      +

      - - -

      diff --git a/View/Elements/Links/index_manage.ctp b/View/Elements/Links/index_manage.ctp index 5d89a49..b0f9dcb 100644 --- a/View/Elements/Links/index_manage.ctp +++ b/View/Elements/Links/index_manage.ctp @@ -1,5 +1,6 @@ - + -
      - element('Links/index_add_link'); ?> + element('Links/index_add_link', array('ngClick' => '" data-dismiss="modal')); ?>
      @@ -89,7 +89,7 @@
    • researchmap - 公開申請中 + 申請中
    • diff --git a/View/Elements/Links/header_button.ctp b/View/Elements/Links/header_button.ctp index ddbead3..cb00a1e 100644 --- a/View/Elements/Links/header_button.ctp +++ b/View/Elements/Links/header_button.ctp @@ -16,7 +16,7 @@
    • researchmap - 公開申請中 + 申請中
    • From b91d7fec6c1e03e18223e6be07f2c849967bc247 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Thu, 9 Oct 2014 09:40:56 +0900 Subject: [PATCH 32/53] Update README.md --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1ab79d2..5b50c56 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,14 @@ Links for NetComomns3 プラグインを追加したのち、ログイン⇒セッティングモードONにして下さい。 - INSERT INTO plugins(id, folder, type, version) VALUES (11, 'links', 1, 'dev-master'); + INSERT INTO plugins (id, language_id, `key`, `name`, namespace, weight, `type`, created_user, created, modified_user, modified) + VALUES (11, 2, 'links', 'リンクリスト', 'netcommons/links', NULL, 1, 1, NULL, 1, NULL); - INSERT INTO plugins_roles(role_id, plugin_id) VALUES (1, 11); + INSERT INTO plugins_roles (role_key, plugin_key, created_user, created, modified_user, modified) + VALUES ('room_administrator', 'links', NULL, NULL, NULL, NULL); - INSERT INTO plugins_rooms(room_id, plugin_id) VALUES (1, 11); + INSERT INTO plugins_rooms (room_id, plugin_key, created_user, created, modified_user, modified) + VALUES (1, 'links', NULL, NULL, NULL, NULL); - INSERT INTO languages_plugins(plugin_id, language_id, name) VALUES (11, 2, 'リンクリスト'); 尚、最新のソースでないとエラーが起こることがあります。 From a2cf6eb1cdf4ba4cdd17b1bc0d4808e3ffd49099 Mon Sep 17 00:00:00 2001 From: RyujiAMANO Date: Wed, 15 Oct 2014 10:10:15 +0900 Subject: [PATCH 33/53] =?UTF-8?q?=E9=96=8B=E7=99=BA=E4=B8=AD=E3=81=AE?= =?UTF-8?q?=E8=A8=98=E8=BF=B0=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/Elements/header_buttons.ctp | 1 - 1 file changed, 1 deletion(-) diff --git a/View/Elements/header_buttons.ctp b/View/Elements/header_buttons.ctp index 081fce1..59795d5 100644 --- a/View/Elements/header_buttons.ctp +++ b/View/Elements/header_buttons.ctp @@ -10,7 +10,6 @@ * @package app.Plugin.Notepads.View.Elements.index */ ?> -

      ボタンだよ

      - - - - - - - - - - - - - - -
      \ No newline at end of file diff --git a/View/Elements/header_buttons.ctp b/View/Elements/header_buttons.ctp deleted file mode 100644 index 59795d5..0000000 --- a/View/Elements/header_buttons.ctp +++ /dev/null @@ -1,41 +0,0 @@ - - * @author SkeletonAuthorName - * @link http://www.netcommons.org NetCommons Project - * @license http://www.netcommons.org/license.txt NetCommons License - * @copyright Copyright 2014, NetCommons Project - * @package app.Plugin.Notepads.View.Elements.index - */ -?> -
      - - - - - - - - - - - -
      - diff --git a/View/Elements/link_form.ctp b/View/Elements/link_form.ctp deleted file mode 100644 index 1bbbc56..0000000 --- a/View/Elements/link_form.ctp +++ /dev/null @@ -1,44 +0,0 @@ - - * @author SkeletonAuthorName - * @link http://www.netcommons.org NetCommons Project - * @license http://www.netcommons.org/license.txt NetCommons License - * @copyright Copyright 2014, NetCommons Project - * @package app.Plugin.AccessCounters.View.Elements.index - */ -?> - - - -element('form_buttons'); -?> diff --git a/View/Elements/link_list.ctp b/View/Elements/link_list.ctp deleted file mode 100644 index 4b40886..0000000 --- a/View/Elements/link_list.ctp +++ /dev/null @@ -1,68 +0,0 @@ -
      - - -
      -

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      Paginator->sort('id'); ?>Paginator->sort('links_block_id'); ?>Paginator->sort('status'); ?>Paginator->sort('language_id'); ?>Paginator->sort('is_auto_translated'); ?>Paginator->sort('translation_engine'); ?>Paginator->sort('links_category_id'); ?>Paginator->sort('title'); ?>Paginator->sort('url'); ?>Paginator->sort('description'); ?>Paginator->sort('created_user'); ?>Paginator->sort('created'); ?>Paginator->sort('modified_user'); ?>Paginator->sort('modified'); ?>
        - Html->link($link['LinksBlock']['id'], array('controller' => 'links_blocks', 'action' => 'view', $link['LinksBlock']['id'])); ?> -   - Html->link($link['Language']['id'], array('controller' => 'languages', 'action' => 'view', $link['Language']['id'])); ?> -    - Html->link($link['LinksCategory']['title'], array('controller' => 'links_categories', 'action' => 'view', $link['LinksCategory']['id'])); ?> -         - Html->link(__('View'), array('action' => 'view', $link['Link']['id'])); ?> - Html->link(__('Edit'), array('action' => 'edit', $link['Link']['id'])); ?> - Form->postLink(__('Delete'), array('action' => 'delete', $link['Link']['id']), null, __('Are you sure you want to delete # %s?', $link['Link']['id'])); ?> -
      -

      - Paginator->counter(array( - 'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}') - )); - ?>

      -
      - Paginator->prev('< ' . __('previous'), array(), null, array('class' => 'prev disabled')); - echo $this->Paginator->numbers(array('separator' => '')); - echo $this->Paginator->next(__('next') . ' >', array(), null, array('class' => 'next disabled')); - ?> -
      -
      -
      \ No newline at end of file diff --git a/View/Helper/LinksFormHelper.php b/View/Helper/LinksFormHelper.php deleted file mode 100644 index 8d452b8..0000000 --- a/View/Helper/LinksFormHelper.php +++ /dev/null @@ -1,42 +0,0 @@ - -Form->create('Link'); ?> -
      - - Form->input('links_block_id'); - echo $this->Form->input('status'); - echo $this->Form->input('language_id'); - echo $this->Form->input('is_auto_translated'); - echo $this->Form->input('translation_engine'); - echo $this->Form->input('links_category_id'); - echo $this->Form->input('title'); - echo $this->Form->input('url'); - echo $this->Form->input('description'); - echo $this->Form->input('created_user'); - echo $this->Form->input('modified_user'); - echo $this->Form->input('Block'); - ?> -
      -Form->end(__('Submit')); ?> - -
      -

      -
        - -
      • Html->link(__('List Links'), array('action' => 'index')); ?>
        • -
      • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Links Categories'), array('controller' => 'links_categories', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Links Category'), array('controller' => 'links_categories', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Blocks'), array('controller' => 'blocks', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Block'), array('controller' => 'blocks', 'action' => 'add')); ?>
        • -
      -
      diff --git a/View/Links/edit.ctp b/View/Links/edit.ctp deleted file mode 100644 index 83f6e98..0000000 --- a/View/Links/edit.ctp +++ /dev/null @@ -1,38 +0,0 @@ -
      -Form->create('Link'); ?> -
      - - Form->input('id'); - echo $this->Form->input('links_block_id'); - echo $this->Form->input('status'); - echo $this->Form->input('language_id'); - echo $this->Form->input('is_auto_translated'); - echo $this->Form->input('translation_engine'); - echo $this->Form->input('links_category_id'); - echo $this->Form->input('title'); - echo $this->Form->input('url'); - echo $this->Form->input('description'); - echo $this->Form->input('created_user'); - echo $this->Form->input('modified_user'); - echo $this->Form->input('Block'); - ?> -
      -Form->end(__('Submit')); ?> -
      -
      -

      -
        - -
      • Form->postLink(__('Delete'), array('action' => 'delete', $this->Form->value('Link.id')), null, __('Are you sure you want to delete # %s?', $this->Form->value('Link.id'))); ?>
        • -
      • Html->link(__('List Links'), array('action' => 'index')); ?>
        • -
      • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Links Categories'), array('controller' => 'links_categories', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Links Category'), array('controller' => 'links_categories', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Blocks'), array('controller' => 'blocks', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Block'), array('controller' => 'blocks', 'action' => 'add')); ?>
        • -
      -
      diff --git a/View/Links/index.ctp b/View/Links/index.ctp deleted file mode 100644 index d78b224..0000000 --- a/View/Links/index.ctp +++ /dev/null @@ -1,78 +0,0 @@ -
      -

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      Paginator->sort('id'); ?>Paginator->sort('links_block_id'); ?>Paginator->sort('status'); ?>Paginator->sort('language_id'); ?>Paginator->sort('is_auto_translated'); ?>Paginator->sort('translation_engine'); ?>Paginator->sort('links_category_id'); ?>Paginator->sort('title'); ?>Paginator->sort('url'); ?>Paginator->sort('description'); ?>Paginator->sort('created_user'); ?>Paginator->sort('created'); ?>Paginator->sort('modified_user'); ?>Paginator->sort('modified'); ?>
        - Html->link($link['LinksBlock']['id'], array('controller' => 'links_blocks', 'action' => 'view', $link['LinksBlock']['id'])); ?> -   - Html->link($link['Language']['id'], array('controller' => 'languages', 'action' => 'view', $link['Language']['id'])); ?> -    - Html->link($link['LinksCategory']['title'], array('controller' => 'links_categories', 'action' => 'view', $link['LinksCategory']['id'])); ?> -         - Html->link(__('View'), array('action' => 'view', $link['Link']['id'])); ?> - Html->link(__('Edit'), array('action' => 'edit', $link['Link']['id'])); ?> - Form->postLink(__('Delete'), array('action' => 'delete', $link['Link']['id']), null, __('Are you sure you want to delete # %s?', $link['Link']['id'])); ?> -
      -

      - Paginator->counter(array( - 'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}') - )); - ?>

      -
      - Paginator->prev('< ' . __('previous'), array(), null, array('class' => 'prev disabled')); - echo $this->Paginator->numbers(array('separator' => '')); - echo $this->Paginator->next(__('next') . ' >', array(), null, array('class' => 'next disabled')); - ?> -
      -
      -
      -

      -
        -
      • Html->link(__('New Link'), array('action' => 'add')); ?>
        • -
      • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Links Categories'), array('controller' => 'links_categories', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Links Category'), array('controller' => 'links_categories', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Blocks'), array('controller' => 'blocks', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Block'), array('controller' => 'blocks', 'action' => 'add')); ?>
        • -
      -
      diff --git a/View/Links/setting_mode/index.ctp b/View/Links/setting_mode/index.ctp deleted file mode 100644 index a0dc1e8..0000000 --- a/View/Links/setting_mode/index.ctp +++ /dev/null @@ -1,32 +0,0 @@ - -Html->script('/links/js/links.js'); ?> -
      - - - -element('header_buttons'); -echo $this->element('link_list'); - -?> - element('index/preview'); - - //状態ラベルの表示 -// echo $this->element('index/status_label'); - - //入力フォームの表示 - echo $this->element('link_form'); - - ?> - - - -
      diff --git a/View/Links/view.ctp b/View/Links/view.ctp deleted file mode 100644 index f5ab0b2..0000000 --- a/View/Links/view.ctp +++ /dev/null @@ -1,129 +0,0 @@ -
      -

      -
      -
      -
      - -   -
      -
      -
      - Html->link($link['LinksBlock']['id'], array('controller' => 'links_blocks', 'action' => 'view', $link['LinksBlock']['id'])); ?> -   -
      -
      -
      - -   -
      -
      -
      - Html->link($link['Language']['id'], array('controller' => 'languages', 'action' => 'view', $link['Language']['id'])); ?> -   -
      -
      -
      - -   -
      -
      -
      - -   -
      -
      -
      - Html->link($link['LinksCategory']['title'], array('controller' => 'links_categories', 'action' => 'view', $link['LinksCategory']['id'])); ?> -   -
      -
      -
      - -   -
      -
      -
      - -   -
      -
      -
      - -   -
      -
      -
      - -   -
      -
      -
      - -   -
      -
      -
      - -   -
      -
      -
      - -   -
      -
      -
      -
      -

      -
        -
      • Html->link(__('Edit Link'), array('action' => 'edit', $link['Link']['id'])); ?>
        • -
      • Form->postLink(__('Delete Link'), array('action' => 'delete', $link['Link']['id']), null, __('Are you sure you want to delete # %s?', $link['Link']['id'])); ?>
        • -
      • Html->link(__('List Links'), array('action' => 'index')); ?>
        • -
      • Html->link(__('New Link'), array('action' => 'add')); ?>
        • -
      • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Links Categories'), array('controller' => 'links_categories', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Links Category'), array('controller' => 'links_categories', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Blocks'), array('controller' => 'blocks', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Block'), array('controller' => 'blocks', 'action' => 'add')); ?>
        • -
      -
      -
      -

      - - - - - - - - - - - - - - - - - - - - - - -
      - Html->link(__('View'), array('controller' => 'blocks', 'action' => 'view', $block['id'])); ?> - Html->link(__('Edit'), array('controller' => 'blocks', 'action' => 'edit', $block['id'])); ?> - Form->postLink(__('Delete'), array('controller' => 'blocks', 'action' => 'delete', $block['id']), null, __('Are you sure you want to delete # %s?', $block['id'])); ?> -
      - - -
      -
        -
      • Html->link(__('New Block'), array('controller' => 'blocks', 'action' => 'add')); ?>
        • -
      -
      -
      diff --git a/View/Links/view/index.ctp b/View/Links/view/index.ctp deleted file mode 100644 index f38627f..0000000 --- a/View/Links/view/index.ctp +++ /dev/null @@ -1,2 +0,0 @@ -element('link_list'); \ No newline at end of file diff --git a/View/LinksCategories/add.ctp b/View/LinksCategories/add.ctp deleted file mode 100644 index e59ba07..0000000 --- a/View/LinksCategories/add.ctp +++ /dev/null @@ -1,30 +0,0 @@ -
      -Form->create('LinksCategory'); ?> -
      - - Form->input('links_block_id'); - echo $this->Form->input('status'); - echo $this->Form->input('language_id'); - echo $this->Form->input('is_auto_translated'); - echo $this->Form->input('translation_engine'); - echo $this->Form->input('title'); - echo $this->Form->input('created_user'); - echo $this->Form->input('modified_user'); - ?> -
      -Form->end(__('Submit')); ?> -
      -
      -

      -
        - -
      • Html->link(__('List Links Categories'), array('action' => 'index')); ?>
        • -
      • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Links'), array('controller' => 'links', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Link'), array('controller' => 'links', 'action' => 'add')); ?>
        • -
      -
      diff --git a/View/LinksCategories/edit.ctp b/View/LinksCategories/edit.ctp deleted file mode 100644 index 912915d..0000000 --- a/View/LinksCategories/edit.ctp +++ /dev/null @@ -1,32 +0,0 @@ -
      -Form->create('LinksCategory'); ?> -
      - - Form->input('id'); - echo $this->Form->input('links_block_id'); - echo $this->Form->input('status'); - echo $this->Form->input('language_id'); - echo $this->Form->input('is_auto_translated'); - echo $this->Form->input('translation_engine'); - echo $this->Form->input('title'); - echo $this->Form->input('created_user'); - echo $this->Form->input('modified_user'); - ?> -
      -Form->end(__('Submit')); ?> -
      -
      -

      -
        - -
      • Form->postLink(__('Delete'), array('action' => 'delete', $this->Form->value('LinksCategory.id')), null, __('Are you sure you want to delete # %s?', $this->Form->value('LinksCategory.id'))); ?>
        • -
      • Html->link(__('List Links Categories'), array('action' => 'index')); ?>
        • -
      • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Links'), array('controller' => 'links', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Link'), array('controller' => 'links', 'action' => 'add')); ?>
        • -
      -
      diff --git a/View/LinksCategories/index.ctp b/View/LinksCategories/index.ctp deleted file mode 100644 index 62af884..0000000 --- a/View/LinksCategories/index.ctp +++ /dev/null @@ -1,68 +0,0 @@ -
      -

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      Paginator->sort('id'); ?>Paginator->sort('links_block_id'); ?>Paginator->sort('status'); ?>Paginator->sort('language_id'); ?>Paginator->sort('is_auto_translated'); ?>Paginator->sort('translation_engine'); ?>Paginator->sort('title'); ?>Paginator->sort('created_user'); ?>Paginator->sort('created'); ?>Paginator->sort('modified_user'); ?>Paginator->sort('modified'); ?>
        - Html->link($linksCategory['LinksBlock']['id'], array('controller' => 'links_blocks', 'action' => 'view', $linksCategory['LinksBlock']['id'])); ?> -   - Html->link($linksCategory['Language']['id'], array('controller' => 'languages', 'action' => 'view', $linksCategory['Language']['id'])); ?> -         - Html->link(__('View'), array('action' => 'view', $linksCategory['LinksCategory']['id'])); ?> - Html->link(__('Edit'), array('action' => 'edit', $linksCategory['LinksCategory']['id'])); ?> - Form->postLink(__('Delete'), array('action' => 'delete', $linksCategory['LinksCategory']['id']), null, __('Are you sure you want to delete # %s?', $linksCategory['LinksCategory']['id'])); ?> -
      -

      - Paginator->counter(array( - 'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}') - )); - ?>

      -
      - Paginator->prev('< ' . __('previous'), array(), null, array('class' => 'prev disabled')); - echo $this->Paginator->numbers(array('separator' => '')); - echo $this->Paginator->next(__('next') . ' >', array(), null, array('class' => 'next disabled')); - ?> -
      -
      -
      -

      -
        -
      • Html->link(__('New Links Category'), array('action' => 'add')); ?>
        • -
      • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Links'), array('controller' => 'links', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Link'), array('controller' => 'links', 'action' => 'add')); ?>
        • -
      -
      diff --git a/View/LinksCategories/view.ctp b/View/LinksCategories/view.ctp deleted file mode 100644 index 9426317..0000000 --- a/View/LinksCategories/view.ctp +++ /dev/null @@ -1,128 +0,0 @@ -
      -

      -
      -
      -
      - -   -
      -
      -
      - Html->link($linksCategory['LinksBlock']['id'], array('controller' => 'links_blocks', 'action' => 'view', $linksCategory['LinksBlock']['id'])); ?> -   -
      -
      -
      - -   -
      -
      -
      - Html->link($linksCategory['Language']['id'], array('controller' => 'languages', 'action' => 'view', $linksCategory['Language']['id'])); ?> -   -
      -
      -
      - -   -
      -
      -
      - -   -
      -
      -
      - -   -
      -
      -
      - -   -
      -
      -
      - -   -
      -
      -
      - -   -
      -
      -
      - -   -
      -
      -
      -
      -

      -
        -
      • Html->link(__('Edit Links Category'), array('action' => 'edit', $linksCategory['LinksCategory']['id'])); ?>
        • -
      • Form->postLink(__('Delete Links Category'), array('action' => 'delete', $linksCategory['LinksCategory']['id']), null, __('Are you sure you want to delete # %s?', $linksCategory['LinksCategory']['id'])); ?>
        • -
      • Html->link(__('List Links Categories'), array('action' => 'index')); ?>
        • -
      • Html->link(__('New Links Category'), array('action' => 'add')); ?>
        • -
      • Html->link(__('List Links Blocks'), array('controller' => 'links_blocks', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Links Block'), array('controller' => 'links_blocks', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Languages'), array('controller' => 'languages', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Language'), array('controller' => 'languages', 'action' => 'add')); ?>
        • -
      • Html->link(__('List Links'), array('controller' => 'links', 'action' => 'index')); ?>
        • -
      • Html->link(__('New Link'), array('controller' => 'links', 'action' => 'add')); ?>
        • -
      -
      -
      -

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      - Html->link(__('View'), array('controller' => 'links', 'action' => 'view', $link['id'])); ?> - Html->link(__('Edit'), array('controller' => 'links', 'action' => 'edit', $link['id'])); ?> - Form->postLink(__('Delete'), array('controller' => 'links', 'action' => 'delete', $link['id']), null, __('Are you sure you want to delete # %s?', $link['id'])); ?> -
      - - -
      -
        -
      • Html->link(__('New Link'), array('controller' => 'links', 'action' => 'add')); ?>
        • -
      -
      -
      diff --git a/webroot/empty b/webroot/empty deleted file mode 100644 index e69de29..0000000 diff --git a/webroot/js/links.js b/webroot/js/links.js deleted file mode 100644 index ec8928c..0000000 --- a/webroot/js/links.js +++ /dev/null @@ -1,233 +0,0 @@ -NetCommonsApp.controller('Links', - function($scope , $http, $sce, $timeout) { - /** - * ヘッダーボタン - * - * @type {boolean} - */ - $scope.sendLock = false; - - - /** - * display header button - * - * @type {boolean} - */ - $scope.displayHeaderBtn = true; - - - /** - * input form object - * - * @type {{display: boolean, - * title: string, - * content: content, - * button: boolean}} - */ - $scope.Form = { - 'display': false, - 'title': '', - 'url' : '', - 'description' : '', - 'button': false - }; - - /** - * content object - * - * @type {{display: boolean}} - */ - $scope.Content = { - 'display': true - }; - - /** - * Notepad plugin URL - * - * @const - */ - $scope.PLUGIN_URL = '/links/links/'; - - /** - * post url - * - * @const - */ - $scope.POST_FORM_URL = $scope.PLUGIN_URL + 'add/'; - - /** - * result message id attribute - * - * @type {sring} - */ - $scope.contentAttrId = ''; - - /** - * input form id attribute - * - * @type {sring} - */ - $scope.inputFormAttrId = ''; - - /** - * input form id attribute - * - * @const - */ - $scope.INPUT_FORM_ATTR_ID = '#nc-links-input-form-'; - - /** - * Initialize - * - * @return {void} - */ - $scope.initialize = function(notepad, frameId) { -// $scope.notepad = notepad; - $scope.frameId = frameId; - - //入力フォームid属性のセット - $scope.inputFormAttrId = $scope.INPUT_FORM_ATTR_ID + $scope.frameId; - -// //POSTフォームid属性のセット -// $scope.postFormAttrId = $scope.POST_FORM_ATTR_ID + $scope.frameId; -// //POSTフォームエリアid属性のセット -// $scope.postFormAreaAttrId = $scope.POST_FORM_ATTR_ID + -// 'area-' + $scope.frameId; - -// //登録処理結果メッセージのid属性のセット -// $scope.resultMessageAttrId = -// $scope.RESULT_MESSAGE_ATTR_ID + $scope.frameId; -// -// //コンテンツのid属性のセット -// $scope.ContentAttrId = $scope.CONTENT_ATTR_ID + $scope.frameId; - - $scope.Content.display = true; - - }; - - /** - * show setting form - * - * @return {void} - */ - $scope.showAddForm = function() { - /** - * 1．フォームを表示する $scope.GET_FORM_URL = $scope.PLUGIN_URL + 'form/'; - * 2．編集・ブロックセッティングのボタンを隠す - * 3．コンテンツを隠す - */ - $scope.Form.display = true; - $scope.displayHeaderBtn = false; - $scope.Form.button = true; - $scope.Content.display = false; - -// //メッセージの初期化 -// $($scope.resultMessageAttrId) -// .removeClass('alert-danger') -// .removeClass('alert-success'); -// $($scope.resultMessageAttrId + ' .message').html(' '); -// -// //POSTフォームエリアの内容をクリア -// $($scope.postFormAreaAttrId).html(' '); - }; - - - /** - * post - * 1: Publish - * 2: Approve - * 3: Draft - * 4: Disapprove - * - * @param {string} status - * @return {void} - */ -// $scope.post = function(postStatus) { -// //$scope.sendLock = true; -// -// $http.get($scope.GET_FORM_URL + -// $scope.frameId + '/' + -// $scope.notepad.Notepad.language_id + '/' + Math.random()) -// .success(function(data, status, headers, config) { -// //POST用のフォームセット -// $($scope.postFormAreaAttrId).html(data); -// //ステータスのセット -// $($scope.postFormAttrId + -// ' select[name="data[Notepad][status]"]').val(postStatus); -// -// var postParams = {}; -// //POSTフォームのシリアライズ -// var postSerialize = -// $($scope.postFormAttrId).serializeArray(); -// var length = postSerialize.length; -// for (var i = 0; i < length; i++) { -// postParams[postSerialize[i]['name']] = -// postSerialize[i]['value']; -// } -// -// //入力フォームのシリアライズ -// var inputSerialize = -// $($scope.inputFormAttrId).serializeArray(); -// var length = inputSerialize.length; -// for (var i = 0; i < length; i++) { -// postParams[inputSerialize[i]['name']] = -// inputSerialize[i]['value']; -// } -// -// //登録情報をPOST -// $scope.sendPost(postParams); -// }) -// .error(function(data, status, headers, config) { -// //keyの取得に失敗 -// if (! data) { data = 'error'; } -// $scope.showResult('error', data); -// }); -// }; - - - $scope.post = function(postStatus) { - var postParams = {}; - - //入力フォームのシリアライズ - var inputSerialize = - $($scope.inputFormAttrId).serializeArray(); - var length = inputSerialize.length; - for (var i = 0; i < length; i++) { - postParams[inputSerialize[i]['name']] = - inputSerialize[i]['value']; - } - $scope.sendPost(postParams); - } - /** - * save - * - * @param {Object.} postParams - * @return {void} - */ - $scope.sendPost = function(postParams) { - $.ajax({ - method: 'POST' , - url: $scope.POST_FORM_URL + $scope.frameId + '/' + Math.random(), - data: postParams, - success: function(json, status, headers, config) { -// $scope.notepad = json.data; -// $($scope.contentAttrId + ' .nc-notepads-title') -// .html(json.data.Notepad.title); -// $($scope.contentAttrId + ' .nc-notepads-content') -// .html(json.data.Notepad.content); -// $scope.showResult('success', json.message); - }, - error: function(json, status, headers, config) { - if (! json.message) { - $scope.showResult('error', headers); - } else { - $scope.showResult('error', json.message); - } - } - }); - }; - - } - - -) \ No newline at end of file From 6cb7ba5989b039857cbfd08794a5c7f7aa7d9e85 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 17 Oct 2014 18:20:58 +0900 Subject: [PATCH 35/53] =?UTF-8?q?=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD?= =?UTF-8?q?=E3=82=B0=E3=82=92AngularJS=E7=94=A8=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/LinkAuthorityController.php | 63 ++++++++ Controller/LinkCategoryController.php | 63 ++++++++ Controller/LinkDisplayController.php | 63 ++++++++ Controller/LinkEditController.php | 78 +++++++++ Controller/LinksAppController.php | 3 +- Controller/LinksController.php | 93 +++++------ README.md | 26 +-- .../content_edit_btn_category.ctp | 5 - .../content_edit_btn_link.ctp | 0 View/Elements/Links/header_button.ctp | 22 --- View/Elements/Links/index_add_category.ctp | 43 ----- View/Elements/Links/index_add_link.ctp | 60 ++----- View/Elements/Links/index_edit.ctp | 100 ------------ View/Elements/Links/index_manage.ctp | 80 ---------- View/Elements/Links/notification_setting.ctp | 1 - .../Elements/{Links => }/content_move_btn.ctp | 0 .../view.ctp} | 15 +- .../view.ctp} | 12 +- .../view.ctp} | 17 +- .../change_order.ctp => LinkEdit/view.ctp} | 29 ++-- View/Links/index.ctp | 77 +-------- View/Links/link_add.ctp | 14 ++ View/Links/manage.ctp | 68 ++++++++ webroot/js/links.js | 150 ++++++++++-------- 24 files changed, 511 insertions(+), 571 deletions(-) create mode 100644 Controller/LinkAuthorityController.php create mode 100644 Controller/LinkCategoryController.php create mode 100644 Controller/LinkDisplayController.php create mode 100644 Controller/LinkEditController.php rename View/Elements/{Links => LinkCategory}/content_edit_btn_category.ctp (79%) rename View/Elements/{Links => LinkEdit}/content_edit_btn_link.ctp (100%) delete mode 100644 View/Elements/Links/index_add_category.ctp delete mode 100644 View/Elements/Links/index_edit.ctp delete mode 100644 View/Elements/Links/index_manage.ctp delete mode 100644 View/Elements/Links/notification_setting.ctp rename View/Elements/{Links => }/content_move_btn.ctp (100%) rename View/{Elements/Links/authority_setting.ctp => LinkAuthority/view.ctp} (89%) rename View/{Elements/Links/category_editor.ctp => LinkCategory/view.ctp} (70%) rename View/{Elements/Links/display_style_setting.ctp => LinkDisplay/view.ctp} (88%) rename View/{Elements/Links/change_order.ctp => LinkEdit/view.ctp} (79%) create mode 100644 View/Links/link_add.ctp create mode 100644 View/Links/manage.ctp diff --git a/Controller/LinkAuthorityController.php b/Controller/LinkAuthorityController.php new file mode 100644 index 0000000..40342d3 --- /dev/null +++ b/Controller/LinkAuthorityController.php @@ -0,0 +1,63 @@ + + * @author Shohei Nakajima + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License + * @copyright Copyright 2014, NetCommons Project + */ + +App::uses('LinksAppController', 'Links.Controller'); + +/** + * LinkAuthority Controller + * + * @author Shohei Nakajima + * @package NetCommons\Links\Controller + */ +class LinkAuthorityController extends LinksAppController { + +/** + * use model + * + * @var array + */ + //public $uses = array(); + +/** + * use component + * + * @var array + */ + public $components = array( + 'NetCommons.NetCommonsFrame', + 'NetCommons.NetCommonsRoomRole', + ); + +/** + * beforeFilter + * + * @return void + */ + public function beforeFilter() { + parent::beforeFilter(); + $this->Auth->allow(); + } + +/** + * view method + * + * @param int $frameId frames.id + * @param string $lang ex)"en" or "ja" etc. + * @return CakeResponse A response object containing the rendered view. + */ + public function view($frameId = 0, $type = 'list') { + if ($this->response->statusCode() !== 200) { + return $this->render(false); + } + + return $this->render('LinkAuthority/view', false); + } +} diff --git a/Controller/LinkCategoryController.php b/Controller/LinkCategoryController.php new file mode 100644 index 0000000..a1b25cc --- /dev/null +++ b/Controller/LinkCategoryController.php @@ -0,0 +1,63 @@ + + * @author Shohei Nakajima + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License + * @copyright Copyright 2014, NetCommons Project + */ + +App::uses('LinksAppController', 'Links.Controller'); + +/** + * LinkCategory Controller + * + * @author Shohei Nakajima + * @package NetCommons\Links\Controller + */ +class LinkCategoryController extends LinksAppController { + +/** + * use model + * + * @var array + */ + //public $uses = array(); + +/** + * use component + * + * @var array + */ + public $components = array( + 'NetCommons.NetCommonsFrame', + 'NetCommons.NetCommonsRoomRole', + ); + +/** + * beforeFilter + * + * @return void + */ + public function beforeFilter() { + parent::beforeFilter(); + $this->Auth->allow(); + } + +/** + * view method + * + * @param int $frameId frames.id + * @param string $lang ex)"en" or "ja" etc. + * @return CakeResponse A response object containing the rendered view. + */ + public function view($frameId = 0, $type = 'list') { + if ($this->response->statusCode() !== 200) { + return $this->render(false); + } + + return $this->render('LinkCategory/view', false); + } +} diff --git a/Controller/LinkDisplayController.php b/Controller/LinkDisplayController.php new file mode 100644 index 0000000..096022b --- /dev/null +++ b/Controller/LinkDisplayController.php @@ -0,0 +1,63 @@ + + * @author Shohei Nakajima + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License + * @copyright Copyright 2014, NetCommons Project + */ + +App::uses('LinksAppController', 'Links.Controller'); + +/** + * LinkDisplay Controller + * + * @author Shohei Nakajima + * @package NetCommons\Links\Controller + */ +class LinkDisplayController extends LinksAppController { + +/** + * use model + * + * @var array + */ + //public $uses = array(); + +/** + * use component + * + * @var array + */ + public $components = array( + 'NetCommons.NetCommonsFrame', + 'NetCommons.NetCommonsRoomRole', + ); + +/** + * beforeFilter + * + * @return void + */ + public function beforeFilter() { + parent::beforeFilter(); + $this->Auth->allow(); + } + +/** + * view method + * + * @param int $frameId frames.id + * @param string $lang ex)"en" or "ja" etc. + * @return CakeResponse A response object containing the rendered view. + */ + public function view($frameId = 0, $type = 'list') { + if ($this->response->statusCode() !== 200) { + return $this->render(false); + } + + return $this->render('LinkDisplay/view', false); + } +} diff --git a/Controller/LinkEditController.php b/Controller/LinkEditController.php new file mode 100644 index 0000000..372804e --- /dev/null +++ b/Controller/LinkEditController.php @@ -0,0 +1,78 @@ + + * @author Shohei Nakajima + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License + * @copyright Copyright 2014, NetCommons Project + */ + +App::uses('LinksAppController', 'Links.Controller'); + +/** + * LinkEdit Controller + * + * @author Shohei Nakajima + * @package NetCommons\Links\Controller + */ +class LinkEditController extends LinksAppController { + +/** + * use model + * + * @var array + */ + //public $uses = array(); + +/** + * use component + * + * @var array + */ + public $components = array( + 'NetCommons.NetCommonsFrame', + 'NetCommons.NetCommonsRoomRole', + ); + +/** + * beforeFilter + * + * @return void + */ + public function beforeFilter() { + parent::beforeFilter(); + $this->Auth->allow(); + } + +/** + * view method + * + * @param int $frameId frames.id + * @param string $lang ex)"en" or "ja" etc. + * @return CakeResponse A response object containing the rendered view. + */ + public function view($frameId = 0, $type = 'list') { + if ($this->response->statusCode() !== 200) { + return $this->render(false); + } + + return $this->render('LinkEdit/view', false); + } + +/** + * viewEdit method + * + * @param int $frameId frames.id + * @param string $lang ex)"en" or "ja" etc. + * @return CakeResponse A response object containing the rendered view. + */ + public function viewEdit($frameId = 0, $type = 'list') { + if ($this->response->statusCode() !== 200) { + return $this->render(false); + } + + return $this->render('Links/link_add', false); + } +} diff --git a/Controller/LinksAppController.php b/Controller/LinksAppController.php index eac6c28..5898035 100644 --- a/Controller/LinksAppController.php +++ b/Controller/LinksAppController.php @@ -10,7 +10,6 @@ */ App::uses('AppController', 'Controller'); -App::uses('NetCommonsFrameAppController', 'NetCommons.Controller'); /** * LinksApp Controller @@ -18,7 +17,7 @@ * @author Shohei Nakajima * @package NetCommons\Links\Controller */ -class LinksAppController extends NetCommonsFrameAppController { +class LinksAppController extends AppController { /** * use component diff --git a/Controller/LinksController.php b/Controller/LinksController.php index 1b7288d..e5bad86 100644 --- a/Controller/LinksController.php +++ b/Controller/LinksController.php @@ -31,7 +31,10 @@ class LinksController extends LinksAppController { * * @var array */ - //public $components = array(); + public $components = array( + 'NetCommons.NetCommonsFrame', + 'NetCommons.NetCommonsRoomRole', + ); /** * beforeFilter @@ -41,6 +44,18 @@ class LinksController extends LinksAppController { public function beforeFilter() { parent::beforeFilter(); $this->Auth->allow(); + + $frameId = (isset($this->params['pass'][0]) ? (int)$this->params['pass'][0] : 0); + //Frameのデータをviewにセット + if (! $this->NetCommonsFrame->setView($this, $frameId)) { + $this->response->statusCode(400); + return; + } + //Roleのデータをviewにセット + if (! $this->NetCommonsRoomRole->setView($this)) { + $this->response->statusCode(400); + return; + } } /** @@ -51,79 +66,47 @@ public function beforeFilter() { * @return CakeResponse A response object containing the rendered view. */ public function index($frameId = 0, $type = 'list') { - $this->_initializeFrame($frameId); $this->set('type', $type); return $this->render('Links/index'); } /** - * index method + * show linkAdd method * * @param int $frameId frames.id - * @param string $lang ex)"en" or "ja" etc. * @return CakeResponse A response object containing the rendered view. */ - public function index_link_add($frameId = 0) { - $this->_initializeFrame($frameId); - $this->layout = false; - return $this->render('Links/index_link_add'); - } + public function linkAdd($frameId = 0) { + if ($this->response->statusCode() !== 200) { + return $this->render(false); + } -/** - * index method - * - * @param int $frameId frames.id - * @param string $lang ex)"en" or "ja" etc. - * @return CakeResponse A response object containing the rendered view. - */ - public function index_edit($frameId = 0) { - $this->_initializeFrame($frameId); - $this->layout = false; - return $this->render('Links/index_edit'); - } + //編集権限チェック + if (! $this->viewVars['contentEditable']) { + $this->response->statusCode(403); + return $this->render(false); + } -/** - * index method - * - * @param int $frameId frames.id - * @param string $lang ex)"en" or "ja" etc. - * @return CakeResponse A response object containing the rendered view. - */ - public function index_manage($frameId = 0) { - $this->_initializeFrame($frameId); - $this->layout = false; - return $this->render('Links/index_manage'); + return $this->render('Links/link_add', false); } /** - * view method + * show manage method * * @param int $frameId frames.id - * @param string $lang ex)"en" or "ja" etc. * @return CakeResponse A response object containing the rendered view. */ - public function view($frameId = 0, $lang = '') { - return $this->render('Links/view'); - } + public function manage($frameId = 0) { + if ($this->response->statusCode() !== 200) { + return $this->render(false); + } -/** - * form method - * - * @param int $frameId frames.id - * @param int $languageId languages.id - * @return CakeResponse A response object containing the rendered view. - */ - public function form($frameId = 0, $languageId = 0) { - return $this->render('Links/form'); - } + //編集権限チェック + if (! $this->viewVars['contentEditable']) { + $this->response->statusCode(403); + return $this->render(false); + } -/** - * edit method - * - * @param int $frameId frames.id - * @return string JSON that indicates success - */ - public function edit($frameId = 0) { - return; + return $this->render('Links/manage', false); } } diff --git a/README.md b/README.md index 5b50c56..eaac6bb 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,4 @@ Links -============== +===== -Links for NetComomns3 - - -【プラグイン追加方法】 - -1. /var/www/app/app/Plugin/にダウンロードしてください。 - -2. 以下、SQLを実行して、「Add plugin」からプラグインを追加してください。 - -プラグインを追加したのち、ログイン⇒セッティングモードONにして下さい。 - - - INSERT INTO plugins (id, language_id, `key`, `name`, namespace, weight, `type`, created_user, created, modified_user, modified) - VALUES (11, 2, 'links', 'リンクリスト', 'netcommons/links', NULL, 1, 1, NULL, 1, NULL); - - INSERT INTO plugins_roles (role_key, plugin_key, created_user, created, modified_user, modified) - VALUES ('room_administrator', 'links', NULL, NULL, NULL, NULL); - - INSERT INTO plugins_rooms (room_id, plugin_key, created_user, created, modified_user, modified) - VALUES (1, 'links', NULL, NULL, NULL, NULL); - - -尚、最新のソースでないとエラーが起こることがあります。 +プロトタイプ（管理画面のモーダル改修済） diff --git a/View/Elements/Links/content_edit_btn_category.ctp b/View/Elements/LinkCategory/content_edit_btn_category.ctp similarity index 79% rename from View/Elements/Links/content_edit_btn_category.ctp rename to View/Elements/LinkCategory/content_edit_btn_category.ctp index 6864775..ce52aa4 100644 --- a/View/Elements/Links/content_edit_btn_category.ctp +++ b/View/Elements/LinkCategory/content_edit_btn_category.ctp @@ -4,11 +4,6 @@ 公開する - - - -
      - -
      - Form->label('category_name', __('カテゴリー名')); - - echo $this->Form->input('category_name', array( - 'label' => false, - 'type' => 'text', - 'class' => 'form-control', - ) - ); - ?> -
      - -

      - - -

      - -
      - - - - - diff --git a/View/Elements/Links/index_add_link.ctp b/View/Elements/Links/index_add_link.ctp index 8b0567a..3155427 100644 --- a/View/Elements/Links/index_add_link.ctp +++ b/View/Elements/Links/index_add_link.ctp @@ -35,29 +35,6 @@ ) ); ?> - -
      @@ -95,29 +72,14 @@
      - - - -

      - - - -

      +

      + + + +

      diff --git a/View/Elements/Links/index_edit.ctp b/View/Elements/Links/index_edit.ctp deleted file mode 100644 index 696cae0..0000000 --- a/View/Elements/Links/index_edit.ctp +++ /dev/null @@ -1,100 +0,0 @@ -
      -
      - カテゴリ１ -
      -
      -
      -
      - -
      - 本サイトは情報共有基盤システムNetCommonsの公式サイトです。 本サイトは国立情報学研究所NetCommonsプロジェクトにより運営されています。 -
      -
      - - element('Links/content_edit_btn', array('published' => false, 'size' => 3)); ?> -
      -
      - -
      - -
      -
      - -
      - 本サイトはe-ラーニング・情報共有の基盤として国立情報学研究所が提供しているNetCommonsの公式サイトです。 -
      -
      - - element('Links/content_edit_btn', array('published' => false, 'size' => 3)); ?> -
      - -
      -
      - - -
      -
      - カテゴリ２ -
      -
      -
      -
      - -
      - Researchmap is an information sharing platform for the researchers. Researchmap is provided by Japan -
      -
      - - element('Links/content_edit_btn', array('published' => true, 'size' => 3)); ?> -
      -
      - -
      - -
      -
      - -
      - - element('Links/content_edit_btn', array('published' => false, 'size' => 3)); ?> -
      -
      - -
      - -
      -
      - -
      - 国立情報学研究所は、情報学という新しい研究分野での「未来価値創成」を目指すわが国唯一の学術総合研究所として、ネットワーク、ソフトウェア、コンテンツなどの情報関連分野の新しい理論・方法論から応用展開までの研究開発を総合的に推進しています。 -
      -
      - - element('Links/content_edit_btn', array('published' => false, 'size' => 3)); ?> -
      - -
      -
      diff --git a/View/Elements/Links/index_manage.ctp b/View/Elements/Links/index_manage.ctp deleted file mode 100644 index b0f9dcb..0000000 --- a/View/Elements/Links/index_manage.ctp +++ /dev/null @@ -1,80 +0,0 @@ - - - - - -
      - - -
      - - - - - -
      - diff --git a/View/Elements/Links/notification_setting.ctp b/View/Elements/Links/notification_setting.ctp deleted file mode 100644 index ea392ad..0000000 --- a/View/Elements/Links/notification_setting.ctp +++ /dev/null @@ -1 +0,0 @@ -notification_setting \ No newline at end of file diff --git a/View/Elements/Links/content_move_btn.ctp b/View/Elements/content_move_btn.ctp similarity index 100% rename from View/Elements/Links/content_move_btn.ctp rename to View/Elements/content_move_btn.ctp diff --git a/View/Elements/Links/authority_setting.ctp b/View/LinkAuthority/view.ctp similarity index 89% rename from View/Elements/Links/authority_setting.ctp rename to View/LinkAuthority/view.ctp index 9dd79e9..97b4fc3 100644 --- a/View/Elements/Links/authority_setting.ctp +++ b/View/LinkAuthority/view.ctp @@ -106,22 +106,11 @@ - - -

      - -

      diff --git a/View/Elements/Links/category_editor.ctp b/View/LinkCategory/view.ctp similarity index 70% rename from View/Elements/Links/category_editor.ctp rename to View/LinkCategory/view.ctp index f866c9f..0f42fda 100644 --- a/View/Elements/Links/category_editor.ctp +++ b/View/LinkCategory/view.ctp @@ -2,7 +2,7 @@
      - element('Links/content_move_btn', array('size' => '2 col-md-2', 'upDisabled' => true)); ?> + element('content_move_btn', array('size' => '2 col-md-2', 'upDisabled' => true)); ?>
      - element('Links/content_edit_btn_category', array('published' => false, 'size' => '2 col-md-1')); ?> + element('LinkCategory/content_edit_btn_category', array('published' => false, 'size' => '2 col-md-1')); ?>
      - element('Links/content_move_btn', array('size' => '2 col-md-2', 'downDisabled' => true)); ?> + element('content_move_btn', array('size' => '2 col-md-2', 'downDisabled' => true)); ?>
      - element('Links/content_edit_btn_category', array('published' => false, 'size' => '2 col-md-1')); ?> + element('LinkCategory/content_edit_btn_category', array('published' => false, 'size' => '2 col-md-1')); ?>
      @@ -72,10 +72,10 @@

      - -

      diff --git a/View/Elements/Links/display_style_setting.ctp b/View/LinkDisplay/view.ctp similarity index 88% rename from View/Elements/Links/display_style_setting.ctp rename to View/LinkDisplay/view.ctp index e0e65ab..2675c63 100644 --- a/View/Elements/Links/display_style_setting.ctp +++ b/View/LinkDisplay/view.ctp @@ -100,24 +100,11 @@ - - -

      - -

      diff --git a/View/Elements/Links/change_order.ctp b/View/LinkEdit/view.ctp similarity index 79% rename from View/Elements/Links/change_order.ctp rename to View/LinkEdit/view.ctp index 9473fec..9ce4e1f 100644 --- a/View/Elements/Links/change_order.ctp +++ b/View/LinkEdit/view.ctp @@ -10,7 +10,7 @@ $description = '本サイトは情報共有基盤システムNetCommonsの公式サイトです。 本サイトは国立情報学研究所NetCommonsプロジェクトにより運営されています。'; ?> - element('Links/content_move_btn', array('size' => '12 col-md-1', 'upDisabled' => true)); ?> + element('content_move_btn', array('size' => '12 col-md-1', 'upDisabled' => true)); ?>
      @@ -23,7 +23,7 @@
      - element('Links/content_edit_btn_link', array( + element('LinkEdit/content_edit_btn_link', array( 'published' => false, 'size' => 12, 'url' => $url, @@ -42,7 +42,7 @@ $description = '本サイトはe-ラーニング・情報共有の基盤として国立情報学研究所が提供しているNetCommonsの公式サイトです。'; ?> - element('Links/content_move_btn', array('size' => '12 col-md-1')); ?> + element('content_move_btn', array('size' => '12 col-md-1')); ?>
      @@ -55,7 +55,7 @@
      - element('Links/content_edit_btn_link', array( + element('LinkEdit/content_edit_btn_link', array( 'published' => false, 'size' => 12, 'url' => $url, @@ -81,7 +81,7 @@ $description = 'Researchmap is an information sharing platform for the researchers. Researchmap is provided by Japan'; ?> - element('Links/content_move_btn', array('size' => '12 col-md-1')); ?> + element('content_move_btn', array('size' => '12 col-md-1')); ?>
      @@ -95,7 +95,7 @@
      - element('Links/content_edit_btn_link', array( + element('LinkEdit/content_edit_btn_link', array( 'published' => true, 'size' => 12, 'url' => $url, @@ -115,7 +115,7 @@ $description = ''; ?> - element('Links/content_move_btn', array('size' => '12 col-md-1')); ?> + element('content_move_btn', array('size' => '12 col-md-1')); ?>
      @@ -129,7 +129,7 @@
      - element('Links/content_edit_btn_link', array( + element('LinkEdit/content_edit_btn_link', array( 'published' => false, 'size' => 12, 'url' => $url, @@ -149,7 +149,7 @@ $description = '国立情報学研究所は、情報学という新しい研究分野での「未来価値創成」を目指すわが国唯一の学術総合研究所として、ネットワーク、ソフトウェア、コンテンツなどの情報関連分野の新しい理論・方法論から応用展開までの研究開発を総合的に推進しています。'; ?> - element('Links/content_move_btn', array('size' => '12 col-md-1', 'downDisabled' => true)); ?> + element('content_move_btn', array('size' => '12 col-md-1', 'downDisabled' => true)); ?>
      @@ -163,27 +163,20 @@
      - element('Links/content_edit_btn_link', array( + element('LinkEdit/content_edit_btn_link', array( 'published' => false, 'size' => 12, 'url' => $url, 'title' => $title, 'description' => $description)); ?> - -

      - -

      diff --git a/View/Links/index.ctp b/View/Links/index.ctp index 55e2fff..fda2fed 100644 --- a/View/Links/index.ctp +++ b/View/Links/index.ctp @@ -1,31 +1,5 @@ Html->script('/links/js/links.js'); ?> - - - - - , )"> - - - -
      +
      element('Links/header_button'); ?>
      -
      +
      - diff --git a/View/Links/link_add.ctp b/View/Links/link_add.ctp new file mode 100644 index 0000000..ead8069 --- /dev/null +++ b/View/Links/link_add.ctp @@ -0,0 +1,14 @@ + +
      + + +
      +
      + element('Links/index_add_link', array('ngClick' => 'cancel()')); ?> +
      diff --git a/View/Links/manage.ctp b/View/Links/manage.ctp new file mode 100644 index 0000000..21d5e4c --- /dev/null +++ b/View/Links/manage.ctp @@ -0,0 +1,68 @@ + +
      + + + +
      + +
      + +
      + + + + + +
      +
      diff --git a/webroot/js/links.js b/webroot/js/links.js index faefcf0..4f9df62 100644 --- a/webroot/js/links.js +++ b/webroot/js/links.js @@ -5,37 +5,29 @@ * */ NetCommonsApp.controller('Links', - function($scope , $http, $sce, $timeout) { + function($scope , $http, $sce, $timeout, dialogs, $modal) { + + $scope.LINK_ADD_URL = '/Links/Links/linkAdd/'; + $scope.PLUGIN_MANAGE_URL = '/Links/Links/manage/'; - var GET_FORM_URL = '/links/links/'; $scope.frameId = 0; - $scope.visibleContainer = true; - $scope.visibleContentList = false; - $scope.visibleContentDropdown = true; $scope.visibleHeaderBtn = true; - $scope.visibleAddLink = false; - $scope.visibleAddLinkForm = false; - $scope.visibleAddLinkForm2 = false; - - $scope.htmlManage = ''; + $scope.visibleContainer = true; $scope.visibleManage = false; - - $scope.htmlEdit = ''; - $scope.visibleEdit = false; - - $scope.htmlAddLink = ''; $scope.visibleAddLink = true; + $scope.visibleContentList = false; + $scope.visibleContentDropdown = true; + + $scope.visibleAddLinkForm = false; $scope.Form = { 'link_url': '', 'title': '', 'description': '' }; - $scope.initialize = function(frameId, visibleContentList, visibleContentDropdown) { - //$scope.initialize = function(frameId) { $scope.frameId = frameId; $scope.visibleContentList = visibleContentList; $scope.visibleContentDropdown = visibleContentDropdown; @@ -44,84 +36,112 @@ NetCommonsApp.controller('Links', $scope.showContainer = function() { $scope.visibleHeaderBtn = true; $scope.visibleContainer = true; - $scope.visibleEdit = false; $scope.visibleManage = false; $scope.visibleAddLink = true; - $scope.visibleAddLinkForm = false; - }; - - $scope.showEdit = function() { - $scope.visibleHeaderBtn = true; - $scope.visibleContainer = false; - $scope.visibleEdit = true; - $scope.visibleManage = false; - $scope.visibleAddLink = true; - $scope.visibleAddLinkForm = false; - }; - - $scope.showManage = function() { - $('#nc-links-manage-modal-' + $scope.frameId).modal('show'); -// $scope.visibleHeaderBtn = true; -// $scope.visibleContainer = false; -// $scope.visibleEdit = false; -// $scope.visibleManage = true; -// $scope.visibleAddLink = false; -// $scope.visibleAddLinkForm = false; - $scope.visibleAddLinkForm2 = false; }; $scope.postDisplayStyle = function() { if ($scope.visibleContentList === true) { $scope.visibleContentList = false; $scope.visibleContentDropdown = true; - } else { + } else { $scope.visibleContentList = true; $scope.visibleContentDropdown = false; - } - $scope.showContainer(); + } + $scope.showContainer(); }; $scope.showAddLink = function() { - $('#nc-links-add-link-modal-' + $scope.frameId).modal('show'); - -// $scope.visibleContainer = false; -// $scope.visibleEdit = false; -// $scope.visibleManage = false; -// $scope.visibleAddLink = false; -// -// $scope.visibleAddLinkForm = true; -// $scope.visibleHeaderBtn = false; - $scope.Form.link_url = ''; $scope.Form.title = ''; $scope.Form.description = ''; + + //リンク追加ダイアログ取得のURL + var url = $scope.LINK_ADD_URL + $scope.frameId; + //ダイアログで使用するJSコントローラ + var controller = 'Links.linkAdd'; + + $modal.open({ + templateUrl: url, + controller: controller, + backdrop: 'static', + scope: $scope + }); }; - $scope.showEditLink = function(link_url, title, description) { - $scope.Form.link_url = link_url; - $scope.Form.title = title; - $scope.Form.description = description; - $scope.visibleAddLinkForm2 = true; + $scope.showManage = function(){ + $scope.visibleAddLinkForm = false; + + //管理モーダル取得のURL + var url = $scope.PLUGIN_MANAGE_URL + $scope.frameId; + //ダイアログで使用するJSコントローラ + var controller = 'Links.edit'; + + modal = $modal.open({ + templateUrl: url, + controller: controller, + backdrop: 'static', + scope: $scope + }); + modal.result.then( + function(result) { + // 表示方法変更設定時 + $scope.postDisplayStyle(); + }, + function(reason) {} + ); + } + + }); + +NetCommonsApp.controller('Links.linkAdd', + function($scope, $http, $sce, $modalInstance, $timeout, dialogs) { + + $scope.cancel = function(){ + $modalInstance.dismiss('cancel'); }; - $scope.deleteEditLink = function() { - return confirm('リンクを削除してもよろしいですか？'); + }); + +NetCommonsApp.controller('Links.edit', + function($scope, $http, $sce, $modalInstance, $timeout, dialogs) { + + $scope.cancel = function(){ + $modalInstance.dismiss('cancel'); }; - $scope.deleteEditCategory = function() { - return confirm('カテゴリーを削除してもよろしいですか？'); + $scope.postDisplayStyle = function(){ + $modalInstance.close(); + }; + + $scope.showEditLink = function(link_url, title, description) { + $scope.visibleAddLinkForm = true; + $scope.Form.link_url = link_url; + $scope.Form.title = title; + $scope.Form.description = description; }; $scope.closeEditLink = function() { - $scope.visibleAddLinkForm2 = false; + $scope.visibleAddLinkForm = false; $scope.Form.link_url = ''; $scope.Form.title = ''; $scope.Form.description = ''; }; - $scope.showAddCategory = function() { - //$('#nc-links-add-link-modal-' + $scope.frameId).dismiss(); - $('#nc-links-add-category-modal-' + $scope.frameId).modal('show'); + $scope.deleteEditLink = function() { + dlg = dialogs.confirm('Confirmation','リンクを削除してもよろしいですか？'); + dlg.result.then( + function(btn){}, // Yes + function(btn){} // NO + ); }; + $scope.deleteEditCategory = function() { + dlg = dialogs.confirm('Confirmation','カテゴリーを削除してもよろしいですか？'); + dlg.result.then( + function(btn){}, // Yes + function(btn){} // NO + ); + }; }); + From cc567377a5520e6499fb3f3dc0551d56d0932106 Mon Sep 17 00:00:00 2001 From: RyujiAMANO Date: Sat, 25 Oct 2014 12:44:48 +0900 Subject: [PATCH 36/53] =?UTF-8?q?author=20=E7=BD=AE=E6=8F=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/LinkAuthorityController.php | 5 +- Controller/LinkCategoryController.php | 5 +- Controller/LinkDisplayController.php | 5 +- Controller/LinkEditController.php | 5 +- Controller/LinksAppController.php | 5 +- Controller/LinksController.php | 21 +++++-- Test/Case/Controller/LinksControllerTest.php | 64 ++++++++++++++++++-- View/Elements/Links/list.ctp | 4 ++ 8 files changed, 90 insertions(+), 24 deletions(-) diff --git a/Controller/LinkAuthorityController.php b/Controller/LinkAuthorityController.php index 40342d3..8b4c0fe 100644 --- a/Controller/LinkAuthorityController.php +++ b/Controller/LinkAuthorityController.php @@ -2,8 +2,7 @@ /** * LinkAuthority Controller * - * @author Noriko Arai - * @author Shohei Nakajima + * @author Ryuji AMANO * @link http://www.netcommons.org NetCommons Project * @license http://www.netcommons.org/license.txt NetCommons License * @copyright Copyright 2014, NetCommons Project @@ -14,7 +13,7 @@ /** * LinkAuthority Controller * - * @author Shohei Nakajima + * @author Ryuji AMANO * @package NetCommons\Links\Controller */ class LinkAuthorityController extends LinksAppController { diff --git a/Controller/LinkCategoryController.php b/Controller/LinkCategoryController.php index a1b25cc..1ea320c 100644 --- a/Controller/LinkCategoryController.php +++ b/Controller/LinkCategoryController.php @@ -2,8 +2,7 @@ /** * LinkCategory Controller * - * @author Noriko Arai - * @author Shohei Nakajima + * @author Ryuji AMANO * @link http://www.netcommons.org NetCommons Project * @license http://www.netcommons.org/license.txt NetCommons License * @copyright Copyright 2014, NetCommons Project @@ -14,7 +13,7 @@ /** * LinkCategory Controller * - * @author Shohei Nakajima + * @author Ryuji AMANO * @package NetCommons\Links\Controller */ class LinkCategoryController extends LinksAppController { diff --git a/Controller/LinkDisplayController.php b/Controller/LinkDisplayController.php index 096022b..786d227 100644 --- a/Controller/LinkDisplayController.php +++ b/Controller/LinkDisplayController.php @@ -2,8 +2,7 @@ /** * LinkDisplay Controller * - * @author Noriko Arai - * @author Shohei Nakajima + * @author Ryuji AMANO * @link http://www.netcommons.org NetCommons Project * @license http://www.netcommons.org/license.txt NetCommons License * @copyright Copyright 2014, NetCommons Project @@ -14,7 +13,7 @@ /** * LinkDisplay Controller * - * @author Shohei Nakajima + * @author Ryuji AMANO * @package NetCommons\Links\Controller */ class LinkDisplayController extends LinksAppController { diff --git a/Controller/LinkEditController.php b/Controller/LinkEditController.php index 372804e..08171b1 100644 --- a/Controller/LinkEditController.php +++ b/Controller/LinkEditController.php @@ -2,8 +2,7 @@ /** * LinkEdit Controller * - * @author Noriko Arai - * @author Shohei Nakajima + * @author Ryuji AMANO * @link http://www.netcommons.org NetCommons Project * @license http://www.netcommons.org/license.txt NetCommons License * @copyright Copyright 2014, NetCommons Project @@ -14,7 +13,7 @@ /** * LinkEdit Controller * - * @author Shohei Nakajima + * @author Ryuji AMANO * @package NetCommons\Links\Controller */ class LinkEditController extends LinksAppController { diff --git a/Controller/LinksAppController.php b/Controller/LinksAppController.php index 5898035..3514b52 100644 --- a/Controller/LinksAppController.php +++ b/Controller/LinksAppController.php @@ -2,8 +2,7 @@ /** * LinksApp Controller * - * @author Noriko Arai - * @author Shohei Nakajima + * @author Ryuji AMANO * @link http://www.netcommons.org NetCommons Project * @license http://www.netcommons.org/license.txt NetCommons License * @copyright Copyright 2014, NetCommons Project @@ -14,7 +13,7 @@ /** * LinksApp Controller * - * @author Shohei Nakajima + * @author Ryuji AMANO * @package NetCommons\Links\Controller */ class LinksAppController extends AppController { diff --git a/Controller/LinksController.php b/Controller/LinksController.php index e5bad86..abebaad 100644 --- a/Controller/LinksController.php +++ b/Controller/LinksController.php @@ -2,8 +2,7 @@ /** * Links Controller * - * @author Noriko Arai - * @author Shohei Nakajima + * @author Ryuji AMANO * @link http://www.netcommons.org NetCommons Project * @license http://www.netcommons.org/license.txt NetCommons License * @copyright Copyright 2014, NetCommons Project @@ -14,7 +13,7 @@ /** * Links Controller * - * @author Shohei Nakajima + * @author Ryuji AMANO * @package NetCommons\Links\Controller */ class LinksController extends LinksAppController { @@ -24,7 +23,9 @@ class LinksController extends LinksAppController { * * @var array */ - //public $uses = array(); + public $uses = array( + 'Links.Link', + ); /** * use component @@ -32,6 +33,7 @@ class LinksController extends LinksAppController { * @var array */ public $components = array( + 'NetCommons.NetCommonsBlock', //use Announcement model 'NetCommons.NetCommonsFrame', 'NetCommons.NetCommonsRoomRole', ); @@ -67,6 +69,17 @@ public function beforeFilter() { */ public function index($frameId = 0, $type = 'list') { $this->set('type', $type); + + //Linkデータを取得 + $links = $this->Link->getLinks( + $this->viewVars['blockId'], + $this->viewVars['contentEditable'] + ); + + //Announcementデータをviewにセット + $this->set('links', $links); + + return $this->render('Links/index'); } diff --git a/Test/Case/Controller/LinksControllerTest.php b/Test/Case/Controller/LinksControllerTest.php index 165a872..a00f55a 100644 --- a/Test/Case/Controller/LinksControllerTest.php +++ b/Test/Case/Controller/LinksControllerTest.php @@ -2,14 +2,16 @@ /** * LinksController Test Case * - * @author Noriko Arai - * @author Shohei Nakajima + * @author Ryuji AMANO * @link http://www.netcommons.org NetCommons Project * @license http://www.netcommons.org/license.txt NetCommons License * @copyright Copyright 2014, NetCommons Project */ App::uses('LinksController', 'Links.Controller'); +App::uses('NetCommonsFrameComponent', 'NetCommons.Controller/Component'); +App::uses('NetCommonsBlockComponent', 'NetCommons.Controller/Component'); +App::uses('NetCommonsRoomRoleComponent', 'NetCommons.Controller/Component'); /** * LinksController Test Case @@ -22,9 +24,61 @@ class LinksControllerTest extends ControllerTestCase { * @var array */ public $fixtures = array( - 'plugin.links.link', - 'plugin.links.site_setting', - 'plugin.links.site_setting_value' +// 'plugin.links.link', +// 'plugin.links.site_setting', +// 'plugin.links.site_setting_value' + 'site_setting', +// 'plugin.frames.box', +// 'plugin.frames.language', + 'plugin.rooms.room', + 'plugin.rooms.roles_rooms_user', + 'plugin.roles.default_role_permission', + 'plugin.rooms.roles_room', + 'plugin.rooms.room_role_permission', + 'plugin.rooms.user', ); + /** + * setUp + * + * @return void + */ + public function setUp() { + parent::setUp(); + Configure::write('Config.language', 'ja'); + } + + /** + * tearDown method + * + * @return void + */ + public function tearDown() { + Configure::write('Config.language', null); + parent::tearDown(); + } + +// /** +// * testBeforeFilterByNoSetFrameId method +// * +// * @return void +// */ +// public function testBeforeFilterByNoSetFrameId() { +// $this->setExpectedException('ForbiddenException'); +// $this->testAction('/announcements/announcements/index', array('method' => 'get')); +// } + + /** + * testIndex method + * + * @return void + */ + public function testIndex() { + $result = $this->testAction('/links/links/index/1', array('method' => 'get')); + debug($result); + + $expected = 'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.'; + $this->assertTextContains($expected, $this->view); + } + } diff --git a/View/Elements/Links/list.ctp b/View/Elements/Links/list.ctp index daf3fa7..b48993d 100644 --- a/View/Elements/Links/list.ctp +++ b/View/Elements/Links/list.ctp @@ -1,6 +1,10 @@
        + + + +
      • カテゴリ１
      • NetCommons2公式サイト 42
      • NetCommons Legacy 42
        • From f863b8169e39c7a6bc91d178318272d9e712906f Mon Sep 17 00:00:00 2001 From: RyujiAMANO Date: Sat, 25 Oct 2014 12:57:39 +0900 Subject: [PATCH 37/53] =?UTF-8?q?Link=20Model=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Link.php | 194 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) create mode 100755 Model/Link.php diff --git a/Model/Link.php b/Model/Link.php new file mode 100755 index 0000000..1400aab --- /dev/null +++ b/Model/Link.php @@ -0,0 +1,194 @@ + + * @link http://www.netcommons.org NetCommons Project + * @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('LinksAppModel', 'Links.Model'); + +/** + * Summary for Link Model + */ +class Link extends LinksAppModel { + +/** + * Link status publish + * + * @var int + */ + const STATUS_PUBLISHED = '1'; + +/** + * Link status approval + * + * @var int + */ + const STATUS_APPROVED = '2'; + +/** + * Link status draft + * + * @var int + */ + const STATUS_DRAFTED = '3'; + +/** + * Link status disapproval + * + * @var int + */ + const STATUS_DISAPPROVED = '4'; + +/** + * Use database config + * + * @var string + */ + public $useDbConfig = 'master'; + +/** + * Validation rules + * + * @var array + */ + public $validate = array( + 'links_block_id' => array( + 'numeric' => array( + 'rule' => array('numeric'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + 'status' => array( + 'numeric' => array( + 'rule' => array('numeric'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + 'language_id' => array( + 'numeric' => array( + 'rule' => array('numeric'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + 'is_auto_translated' => array( + 'boolean' => array( + 'rule' => array('boolean'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + 'url' => array( + 'notEmpty' => array( + 'rule' => array('notEmpty'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + ); + + //The Associations below have been created with all possible keys, those that are not needed can be removed + +/** + * belongsTo associations + * + * @var array + */ + public $belongsTo = array( +// 'LinksBlock' => array( +// 'className' => 'LinksBlock', +// 'foreignKey' => 'links_block_id', +// 'conditions' => '', +// 'fields' => '', +// 'order' => '' +// ), +// 'Language' => array( +// 'className' => 'Language', +// 'foreignKey' => 'language_id', +// 'conditions' => '', +// 'fields' => '', +// 'order' => '' +// ), +// 'LinksCategory' => array( +// 'className' => 'LinksCategory', +// 'foreignKey' => 'links_category_id', +// 'conditions' => '', +// 'fields' => '', +// 'order' => '' +// ) + ); + +/** + * hasAndBelongsToMany associations + * + * @var array + */ + public $hasAndBelongsToMany = array( +// 'Block' => array( +// 'className' => 'Block', +// 'joinTable' => 'links_blocks', +// 'foreignKey' => 'link_id', +// 'associationForeignKey' => 'block_id', +// 'unique' => 'keepExisting', +// 'conditions' => '', +// 'fields' => '', +// 'order' => '', +// 'limit' => '', +// 'offset' => '', +// 'finderQuery' => '', +// ) + ); + + + public function getLinks($blockId, $contentEditable){ + $conditions = array( +// 'block_id' => $blockId, + ); + if (! $contentEditable) { + $conditions['status'] = NetCommonsBlockComponent::STATUS_PUBLISHED; + } + + $links = $this->find('all', array( + 'conditions' => $conditions, + 'order' => 'Link' . '.id DESC', + ) + ); + +// if (! $links) { +// $links = $this->create(); +// $links['Link']['content'] = ''; +// $links['Link']['status'] = '0'; +// $links['Link']['block_id'] = '0'; +// $links['Link']['key'] = ''; +// $links['Link']['id'] = '0'; +// } + + return $links; + } + +} From 2ee206caaeab8fc04fcec223387ed3c4b090a6d7 Mon Sep 17 00:00:00 2001 From: RyujiAMANO Date: Sat, 25 Oct 2014 13:59:51 +0900 Subject: [PATCH 38/53] =?UTF-8?q?bake=E3=81=97=E3=81=9FModel=E9=96=A2?= =?UTF-8?q?=E9=80=A3=E3=82=92=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88=E3=81=97?= =?UTF-8?q?=E3=81=A8=E3=81=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Link.php | 120 +++++----------------- Model/LinkCategory.php | 114 ++++++++++++++++++++ Model/LinkCategoryOrder.php | 55 ++++++++++ Model/LinkFrameSetting.php | 65 ++++++++++++ Model/LinkOrder.php | 55 ++++++++++ Test/Case/Model/LinkCategoryOrderTest.php | 47 +++++++++ Test/Case/Model/LinkCategoryTest.php | 49 +++++++++ Test/Case/Model/LinkFrameSettingTest.php | 47 +++++++++ Test/Case/Model/LinkOrderTest.php | 47 +++++++++ Test/Case/Model/LinkTest.php | 48 +++++++++ Test/Fixture/LinkCategoryFixture.php | 57 ++++++++++ Test/Fixture/LinkCategoryOrderFixture.php | 53 ++++++++++ Test/Fixture/LinkFixture.php | 65 ++++++++++++ Test/Fixture/LinkFrameSettingFixture.php | 59 +++++++++++ Test/Fixture/LinkOrderFixture.php | 53 ++++++++++ 15 files changed, 837 insertions(+), 97 deletions(-) mode change 100755 => 100644 Model/Link.php create mode 100644 Model/LinkCategory.php create mode 100644 Model/LinkCategoryOrder.php create mode 100644 Model/LinkFrameSetting.php create mode 100644 Model/LinkOrder.php create mode 100644 Test/Case/Model/LinkCategoryOrderTest.php create mode 100644 Test/Case/Model/LinkCategoryTest.php create mode 100644 Test/Case/Model/LinkFrameSettingTest.php create mode 100644 Test/Case/Model/LinkOrderTest.php create mode 100644 Test/Case/Model/LinkTest.php create mode 100644 Test/Fixture/LinkCategoryFixture.php create mode 100644 Test/Fixture/LinkCategoryOrderFixture.php create mode 100644 Test/Fixture/LinkFixture.php create mode 100644 Test/Fixture/LinkFrameSettingFixture.php create mode 100644 Test/Fixture/LinkOrderFixture.php diff --git a/Model/Link.php b/Model/Link.php old mode 100755 new mode 100644 index 1400aab..38a5ef2 --- a/Model/Link.php +++ b/Model/Link.php @@ -2,14 +2,11 @@ /** * Link Model * - * @property LinksBlock $LinksBlock - * @property Language $Language - * @property LinksCategory $LinksCategory - * @property Block $Block + * @property LinkCategory $LinkCategory * - * @author Jun Nishikawa - * @link http://www.netcommons.org NetCommons Project - * @license http://www.netcommons.org/license.txt NetCommons License +* @author Ryuji AMANO +* @link http://www.netcommons.org NetCommons Project +* @license http://www.netcommons.org/license.txt NetCommons License */ App::uses('LinksAppModel', 'Links.Model'); @@ -19,48 +16,13 @@ */ class Link extends LinksAppModel { -/** - * Link status publish - * - * @var int - */ - const STATUS_PUBLISHED = '1'; - -/** - * Link status approval - * - * @var int - */ - const STATUS_APPROVED = '2'; - -/** - * Link status draft - * - * @var int - */ - const STATUS_DRAFTED = '3'; - -/** - * Link status disapproval - * - * @var int - */ - const STATUS_DISAPPROVED = '4'; - -/** - * Use database config - * - * @var string - */ - public $useDbConfig = 'master'; - /** * Validation rules * * @var array */ public $validate = array( - 'links_block_id' => array( + 'link_category_id' => array( 'numeric' => array( 'rule' => array('numeric'), //'message' => 'Your custom message here', @@ -70,9 +32,9 @@ class Link extends LinksAppModel { //'on' => 'create', // Limit validation to 'create' or 'update' operations ), ), - 'status' => array( - 'numeric' => array( - 'rule' => array('numeric'), + 'key' => array( + 'notEmpty' => array( + 'rule' => array('notEmpty'), //'message' => 'Your custom message here', //'allowEmpty' => false, //'required' => false, @@ -80,7 +42,7 @@ class Link extends LinksAppModel { //'on' => 'create', // Limit validation to 'create' or 'update' operations ), ), - 'language_id' => array( + 'status' => array( 'numeric' => array( 'rule' => array('numeric'), //'message' => 'Your custom message here', @@ -90,9 +52,9 @@ class Link extends LinksAppModel { //'on' => 'create', // Limit validation to 'create' or 'update' operations ), ), - 'is_auto_translated' => array( - 'boolean' => array( - 'rule' => array('boolean'), + 'click_number' => array( + 'numeric' => array( + 'rule' => array('numeric'), //'message' => 'Your custom message here', //'allowEmpty' => false, //'required' => false, @@ -100,9 +62,9 @@ class Link extends LinksAppModel { //'on' => 'create', // Limit validation to 'create' or 'update' operations ), ), - 'url' => array( - 'notEmpty' => array( - 'rule' => array('notEmpty'), + 'is_auto_translated' => array( + 'boolean' => array( + 'rule' => array('boolean'), //'message' => 'Your custom message here', //'allowEmpty' => false, //'required' => false, @@ -120,51 +82,15 @@ class Link extends LinksAppModel { * @var array */ public $belongsTo = array( -// 'LinksBlock' => array( -// 'className' => 'LinksBlock', -// 'foreignKey' => 'links_block_id', -// 'conditions' => '', -// 'fields' => '', -// 'order' => '' -// ), -// 'Language' => array( -// 'className' => 'Language', -// 'foreignKey' => 'language_id', -// 'conditions' => '', -// 'fields' => '', -// 'order' => '' -// ), -// 'LinksCategory' => array( -// 'className' => 'LinksCategory', -// 'foreignKey' => 'links_category_id', -// 'conditions' => '', -// 'fields' => '', -// 'order' => '' -// ) - ); - -/** - * hasAndBelongsToMany associations - * - * @var array - */ - public $hasAndBelongsToMany = array( -// 'Block' => array( -// 'className' => 'Block', -// 'joinTable' => 'links_blocks', -// 'foreignKey' => 'link_id', -// 'associationForeignKey' => 'block_id', -// 'unique' => 'keepExisting', -// 'conditions' => '', -// 'fields' => '', -// 'order' => '', -// 'limit' => '', -// 'offset' => '', -// 'finderQuery' => '', -// ) + 'LinkCategory' => array( + 'className' => 'LinkCategory', + 'foreignKey' => 'link_category_id', + 'conditions' => '', + 'fields' => '', + 'order' => '' + ) ); - public function getLinks($blockId, $contentEditable){ $conditions = array( // 'block_id' => $blockId, @@ -175,7 +101,7 @@ public function getLinks($blockId, $contentEditable){ $links = $this->find('all', array( 'conditions' => $conditions, - 'order' => 'Link' . '.id DESC', +// 'order' => 'id' . '.id DESC', ) ); diff --git a/Model/LinkCategory.php b/Model/LinkCategory.php new file mode 100644 index 0000000..b2dc2f5 --- /dev/null +++ b/Model/LinkCategory.php @@ -0,0 +1,114 @@ + +* @link http://www.netcommons.org NetCommons Project +* @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('LinksAppModel', 'Links.Model'); + +/** + * Summary for LinkCategory Model + */ +class LinkCategory extends LinksAppModel { + +/** + * Validation rules + * + * @var array + */ + public $validate = array( + 'block_id' => array( + 'numeric' => array( + 'rule' => array('numeric'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + 'key' => array( + 'notEmpty' => array( + 'rule' => array('notEmpty'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + 'is_auto_translated' => array( + 'boolean' => array( + 'rule' => array('boolean'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + ); + + //The Associations below have been created with all possible keys, those that are not needed can be removed + +/** + * belongsTo associations + * + * @var array + */ + public $belongsTo = array( + 'Block' => array( + 'className' => 'Block', + 'foreignKey' => 'block_id', + 'conditions' => '', + 'fields' => '', + 'order' => '' + ) + ); + +/** + * hasMany associations + * + * @var array + */ + public $hasMany = array( + 'Link' => array( + 'className' => 'Link', + 'foreignKey' => 'link_category_id', + 'dependent' => false, + 'conditions' => '', + 'fields' => '', + 'order' => '', + 'limit' => '', + 'offset' => '', + 'exclusive' => '', + 'finderQuery' => '', + 'counterQuery' => '' + ) + ); + public function getPublished($blockId, $contentEditable){ + $conditions = array( + 'block_id' => $blockId, + ); + // カテゴリにはステータスがない +// if (! $contentEditable) { +// $conditions['status'] = NetCommonsBlockComponent::STATUS_PUBLISHED; +// } + + // ソート順はlink_category_ordersテーブル参照 + $categories = $this->find('all', array( + 'conditions' => $conditions, +// 'order' => 'Link' . '.id DESC', + ) + ); + + return $categories; + } + +} diff --git a/Model/LinkCategoryOrder.php b/Model/LinkCategoryOrder.php new file mode 100644 index 0000000..d16518e --- /dev/null +++ b/Model/LinkCategoryOrder.php @@ -0,0 +1,55 @@ + +* @link http://www.netcommons.org NetCommons Project +* @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('LinksAppModel', 'Links.Model'); + +/** + * Summary for LinkCategoryOrder Model + */ +class LinkCategoryOrder extends LinksAppModel { + +/** + * Validation rules + * + * @var array + */ + public $validate = array( + 'link_category_key' => array( + 'notEmpty' => array( + 'rule' => array('notEmpty'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + 'block_key' => array( + 'notEmpty' => array( + 'rule' => array('notEmpty'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + 'weight' => array( + 'numeric' => array( + 'rule' => array('numeric'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + ); +} diff --git a/Model/LinkFrameSetting.php b/Model/LinkFrameSetting.php new file mode 100644 index 0000000..19c288d --- /dev/null +++ b/Model/LinkFrameSetting.php @@ -0,0 +1,65 @@ + +* @link http://www.netcommons.org NetCommons Project +* @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('LinksAppModel', 'Links.Model'); + +/** + * Summary for LinkFrameSetting Model + */ +class LinkFrameSetting extends LinksAppModel { + +/** + * Validation rules + * + * @var array + */ + public $validate = array( + 'frame_key' => array( + 'notEmpty' => array( + 'rule' => array('notEmpty'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + 'display_type' => array( + 'boolean' => array( + 'rule' => array('boolean'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + 'open_new_tab' => array( + 'boolean' => array( + 'rule' => array('boolean'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + 'display_click_number' => array( + 'boolean' => array( + 'rule' => array('boolean'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + ); +} diff --git a/Model/LinkOrder.php b/Model/LinkOrder.php new file mode 100644 index 0000000..880daea --- /dev/null +++ b/Model/LinkOrder.php @@ -0,0 +1,55 @@ + +* @link http://www.netcommons.org NetCommons Project +* @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('LinksAppModel', 'Links.Model'); + +/** + * Summary for LinkOrder Model + */ +class LinkOrder extends LinksAppModel { + +/** + * Validation rules + * + * @var array + */ + public $validate = array( + 'link_key' => array( + 'notEmpty' => array( + 'rule' => array('notEmpty'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + 'link_category_key' => array( + 'notEmpty' => array( + 'rule' => array('notEmpty'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + 'weight' => array( + 'numeric' => array( + 'rule' => array('numeric'), + //'message' => 'Your custom message here', + //'allowEmpty' => false, + //'required' => false, + //'last' => false, // Stop validation after this rule + //'on' => 'create', // Limit validation to 'create' or 'update' operations + ), + ), + ); +} diff --git a/Test/Case/Model/LinkCategoryOrderTest.php b/Test/Case/Model/LinkCategoryOrderTest.php new file mode 100644 index 0000000..7e3b75e --- /dev/null +++ b/Test/Case/Model/LinkCategoryOrderTest.php @@ -0,0 +1,47 @@ + +* @link http://www.netcommons.org NetCommons Project +* @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('LinkCategoryOrder', 'Links.Model'); + +/** + * Summary for LinkCategoryOrder Test Case + */ +class LinkCategoryOrderTest extends CakeTestCase { + +/** + * Fixtures + * + * @var array + */ + public $fixtures = array( + 'plugin.links.link_category_order' + ); + +/** + * setUp method + * + * @return void + */ + public function setUp() { + parent::setUp(); + $this->LinkCategoryOrder = ClassRegistry::init('Links.LinkCategoryOrder'); + } + +/** + * tearDown method + * + * @return void + */ + public function tearDown() { + unset($this->LinkCategoryOrder); + + parent::tearDown(); + } + +} diff --git a/Test/Case/Model/LinkCategoryTest.php b/Test/Case/Model/LinkCategoryTest.php new file mode 100644 index 0000000..1882a05 --- /dev/null +++ b/Test/Case/Model/LinkCategoryTest.php @@ -0,0 +1,49 @@ + +* @link http://www.netcommons.org NetCommons Project +* @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('LinkCategory', 'Links.Model'); + +/** + * Summary for LinkCategory Test Case + */ +class LinkCategoryTest extends CakeTestCase { + +/** + * Fixtures + * + * @var array + */ + public $fixtures = array( + 'plugin.links.link_category', + 'plugin.links.block', + 'plugin.links.link' + ); + +/** + * setUp method + * + * @return void + */ + public function setUp() { + parent::setUp(); + $this->LinkCategory = ClassRegistry::init('Links.LinkCategory'); + } + +/** + * tearDown method + * + * @return void + */ + public function tearDown() { + unset($this->LinkCategory); + + parent::tearDown(); + } + +} diff --git a/Test/Case/Model/LinkFrameSettingTest.php b/Test/Case/Model/LinkFrameSettingTest.php new file mode 100644 index 0000000..8124ae9 --- /dev/null +++ b/Test/Case/Model/LinkFrameSettingTest.php @@ -0,0 +1,47 @@ + +* @link http://www.netcommons.org NetCommons Project +* @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('LinkFrameSetting', 'Links.Model'); + +/** + * Summary for LinkFrameSetting Test Case + */ +class LinkFrameSettingTest extends CakeTestCase { + +/** + * Fixtures + * + * @var array + */ + public $fixtures = array( + 'plugin.links.link_frame_setting' + ); + +/** + * setUp method + * + * @return void + */ + public function setUp() { + parent::setUp(); + $this->LinkFrameSetting = ClassRegistry::init('Links.LinkFrameSetting'); + } + +/** + * tearDown method + * + * @return void + */ + public function tearDown() { + unset($this->LinkFrameSetting); + + parent::tearDown(); + } + +} diff --git a/Test/Case/Model/LinkOrderTest.php b/Test/Case/Model/LinkOrderTest.php new file mode 100644 index 0000000..c7b3279 --- /dev/null +++ b/Test/Case/Model/LinkOrderTest.php @@ -0,0 +1,47 @@ + +* @link http://www.netcommons.org NetCommons Project +* @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('LinkOrder', 'Links.Model'); + +/** + * Summary for LinkOrder Test Case + */ +class LinkOrderTest extends CakeTestCase { + +/** + * Fixtures + * + * @var array + */ + public $fixtures = array( + 'plugin.links.link_order' + ); + +/** + * setUp method + * + * @return void + */ + public function setUp() { + parent::setUp(); + $this->LinkOrder = ClassRegistry::init('Links.LinkOrder'); + } + +/** + * tearDown method + * + * @return void + */ + public function tearDown() { + unset($this->LinkOrder); + + parent::tearDown(); + } + +} diff --git a/Test/Case/Model/LinkTest.php b/Test/Case/Model/LinkTest.php new file mode 100644 index 0000000..8c05fcc --- /dev/null +++ b/Test/Case/Model/LinkTest.php @@ -0,0 +1,48 @@ + +* @link http://www.netcommons.org NetCommons Project +* @license http://www.netcommons.org/license.txt NetCommons License + */ + +App::uses('Link', 'Links.Model'); + +/** + * Summary for Link Test Case + */ +class LinkTest extends CakeTestCase { + +/** + * Fixtures + * + * @var array + */ + public $fixtures = array( + 'plugin.links.link', + 'plugin.links.link_category' + ); + +/** + * setUp method + * + * @return void + */ + public function setUp() { + parent::setUp(); + $this->Link = ClassRegistry::init('Links.Link'); + } + +/** + * tearDown method + * + * @return void + */ + public function tearDown() { + unset($this->Link); + + parent::tearDown(); + } + +} diff --git a/Test/Fixture/LinkCategoryFixture.php b/Test/Fixture/LinkCategoryFixture.php new file mode 100644 index 0000000..13b3cd8 --- /dev/null +++ b/Test/Fixture/LinkCategoryFixture.php @@ -0,0 +1,57 @@ + +* @link http://www.netcommons.org NetCommons Project +* @license http://www.netcommons.org/license.txt NetCommons License + */ + +/** + * Summary for LinkCategoryFixture + */ +class LinkCategoryFixture extends CakeTestFixture { + +/** + * Fields + * + * @var array + */ + public $fields = array( + 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'key' => 'primary', 'comment' => 'ID | | | '), + 'block_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'comment' => 'block id | ブロックID | blocks.id | '), + 'key' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'category key | カテゴリーKey | | ', 'charset' => 'utf8'), + 'name' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'category name | カテゴリー名 | | ', 'charset' => 'utf8'), + 'is_auto_translated' => array('type' => 'boolean', 'null' => false, 'default' => '0', 'comment' => 'translation type. 0:original , 1:auto translation | 翻訳タイプ 0:オリジナル、1:自動翻訳 | | '), + 'translation_engine' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'translation engine | 翻訳エンジン | | ', 'charset' => 'utf8'), + 'created_user' => array('type' => 'integer', 'null' => true, 'default' => '0', 'comment' => 'created user | 作成者 | users.id | '), + 'created' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => 'created datetime | 作成日時 | | '), + 'modified_user' => array('type' => 'integer', 'null' => true, 'default' => '0', 'comment' => 'modified user | 更新者 | users.id | '), + 'modified' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => 'modified datetime | 更新日時 | | '), + 'indexes' => array( + 'PRIMARY' => array('column' => 'id', 'unique' => 1) + ), + 'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB') + ); + +/** + * Records + * + * @var array + */ + public $records = array( + array( + 'id' => 1, + 'block_id' => 1, + 'key' => 'Lorem ipsum dolor sit amet', + 'name' => 'Lorem ipsum dolor sit amet', + 'is_auto_translated' => 1, + 'translation_engine' => 'Lorem ipsum dolor sit amet', + 'created_user' => 1, + 'created' => '2014-10-25 04:56:24', + 'modified_user' => 1, + 'modified' => '2014-10-25 04:56:24' + ), + ); + +} diff --git a/Test/Fixture/LinkCategoryOrderFixture.php b/Test/Fixture/LinkCategoryOrderFixture.php new file mode 100644 index 0000000..1bc4497 --- /dev/null +++ b/Test/Fixture/LinkCategoryOrderFixture.php @@ -0,0 +1,53 @@ + +* @link http://www.netcommons.org NetCommons Project +* @license http://www.netcommons.org/license.txt NetCommons License + */ + +/** + * Summary for LinkCategoryOrderFixture + */ +class LinkCategoryOrderFixture extends CakeTestFixture { + +/** + * Fields + * + * @var array + */ + public $fields = array( + 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'key' => 'primary', 'comment' => 'ID | | | '), + 'link_category_key' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'category key | カテゴリーKey | link_categories.key | ', 'charset' => 'utf8'), + 'block_key' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'block key | ブロックKey | blocks.key | ', 'charset' => 'utf8'), + 'weight' => array('type' => 'integer', 'null' => false, 'default' => '0', 'comment' => 'The weight of the display(display order) | 表示の重み(表示順序) | | '), + 'created_user' => array('type' => 'integer', 'null' => true, 'default' => '0', 'comment' => 'created user | 作成者 | users.id | '), + 'created' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => 'created datetime | 作成日時 | | '), + 'modified_user' => array('type' => 'integer', 'null' => true, 'default' => '0', 'comment' => 'modified user | 更新者 | users.id | '), + 'modified' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => 'modified datetime | 更新日時 | | '), + 'indexes' => array( + 'PRIMARY' => array('column' => 'id', 'unique' => 1) + ), + 'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB') + ); + +/** + * Records + * + * @var array + */ + public $records = array( + array( + 'id' => 1, + 'link_category_key' => 'Lorem ipsum dolor sit amet', + 'block_key' => 'Lorem ipsum dolor sit amet', + 'weight' => 1, + 'created_user' => 1, + 'created' => '2014-10-25 04:56:50', + 'modified_user' => 1, + 'modified' => '2014-10-25 04:56:50' + ), + ); + +} diff --git a/Test/Fixture/LinkFixture.php b/Test/Fixture/LinkFixture.php new file mode 100644 index 0000000..c39f756 --- /dev/null +++ b/Test/Fixture/LinkFixture.php @@ -0,0 +1,65 @@ + +* @link http://www.netcommons.org NetCommons Project +* @license http://www.netcommons.org/license.txt NetCommons License + */ + +/** + * Summary for LinkFixture + */ +class LinkFixture extends CakeTestFixture { + +/** + * Fields + * + * @var array + */ + public $fields = array( + 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'key' => 'primary', 'comment' => 'ID | | | '), + 'link_category_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'comment' => 'category id | カテゴリーID | link_categories.id | '), + 'key' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'link key | リンクキー | Hash値 | ', 'charset' => 'utf8'), + 'status' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 4, 'comment' => 'public status, 1: public, 2: public pending, 3: draft during 4: remand | 公開状況 1:公開中、2:公開申請中、3:下書き中、4:差し戻し | | '), + 'url' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'link url | リンク先URL | | ', 'charset' => 'utf8'), + 'title' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'title | タイトル | | ', 'charset' => 'utf8'), + 'description' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'description | 説明 | | ', 'charset' => 'utf8'), + 'click_number' => array('type' => 'integer', 'null' => false, 'default' => '0', 'comment' => 'link access number | リンクアクセス数 | | '), + 'is_auto_translated' => array('type' => 'boolean', 'null' => false, 'default' => '0', 'comment' => 'translation type. 0:original , 1:auto translation | 翻訳タイプ 0:オリジナル、1:自動翻訳 | | '), + 'translation_engine' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'translation engine | 翻訳エンジン | | ', 'charset' => 'utf8'), + 'created_user' => array('type' => 'integer', 'null' => true, 'default' => '0', 'comment' => 'created user | 作成者 | users.id | '), + 'created' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => 'created datetime | 作成日時 | | '), + 'modified_user' => array('type' => 'integer', 'null' => true, 'default' => '0', 'comment' => 'modified user | 更新者 | users.id | '), + 'modified' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => 'modified datetime | 更新日時 | | '), + 'indexes' => array( + 'PRIMARY' => array('column' => 'id', 'unique' => 1) + ), + 'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB') + ); + +/** + * Records + * + * @var array + */ + public $records = array( + array( + 'id' => 1, + 'link_category_id' => 1, + 'key' => 'Lorem ipsum dolor sit amet', + 'status' => 1, + 'url' => 'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.', + 'title' => 'Lorem ipsum dolor sit amet', + 'description' => 'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.', + 'click_number' => 1, + 'is_auto_translated' => 1, + 'translation_engine' => 'Lorem ipsum dolor sit amet', + 'created_user' => 1, + 'created' => '2014-10-25 04:56:32', + 'modified_user' => 1, + 'modified' => '2014-10-25 04:56:32' + ), + ); + +} diff --git a/Test/Fixture/LinkFrameSettingFixture.php b/Test/Fixture/LinkFrameSettingFixture.php new file mode 100644 index 0000000..e7377ee --- /dev/null +++ b/Test/Fixture/LinkFrameSettingFixture.php @@ -0,0 +1,59 @@ + +* @link http://www.netcommons.org NetCommons Project +* @license http://www.netcommons.org/license.txt NetCommons License + */ + +/** + * Summary for LinkFrameSettingFixture + */ +class LinkFrameSettingFixture extends CakeTestFixture { + +/** + * Fields + * + * @var array + */ + public $fields = array( + 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'key' => 'primary', 'comment' => 'ID | | | '), + 'frame_key' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'frame key | フレームKey | frames.key | ', 'charset' => 'utf8'), + 'display_type' => array('type' => 'boolean', 'null' => false, 'default' => '0', 'comment' => 'display type, 1: dropdown type, 2: list type (no explanation), 3: list type (with explanation) | 表示方法種別 1: ドロップダウン型、2:リスト型（説明なし）、3:リスト型（説明あり） | | '), + 'open_new_tab' => array('type' => 'boolean', 'null' => false, 'default' => '1', 'comment' => 'open new tab, 1: new tab or 0: same window | リンクの開き方 0:同じウィンドウ内、1:新しいタブ | | '), + 'display_click_number' => array('type' => 'boolean', 'null' => false, 'default' => '1', 'comment' => 'displayclick number, 1: display or 0: no display | リンクのクリック数の表示 0:表示しない、1:表示する | | '), + 'category_separator_line' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'separator line between the categories | カテゴリ間の区切り線 | | ', 'charset' => 'utf8'), + 'list_style' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'list mark | リストマーク | | ', 'charset' => 'utf8'), + 'created_user' => array('type' => 'integer', 'null' => true, 'default' => '0', 'comment' => 'created user | 作成者 | users.id | '), + 'created' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => 'created datetime | 作成日時 | | '), + 'modified_user' => array('type' => 'integer', 'null' => true, 'default' => '0', 'comment' => 'modified user | 更新者 | users.id | '), + 'modified' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => 'modified datetime | 更新日時 | | '), + 'indexes' => array( + 'PRIMARY' => array('column' => 'id', 'unique' => 1) + ), + 'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB') + ); + +/** + * Records + * + * @var array + */ + public $records = array( + array( + 'id' => 1, + 'frame_key' => 'Lorem ipsum dolor sit amet', + 'display_type' => 1, + 'open_new_tab' => 1, + 'display_click_number' => 1, + 'category_separator_line' => 'Lorem ipsum dolor sit amet', + 'list_style' => 'Lorem ipsum dolor sit amet', + 'created_user' => 1, + 'created' => '2014-10-25 04:55:51', + 'modified_user' => 1, + 'modified' => '2014-10-25 04:55:51' + ), + ); + +} diff --git a/Test/Fixture/LinkOrderFixture.php b/Test/Fixture/LinkOrderFixture.php new file mode 100644 index 0000000..f93a785 --- /dev/null +++ b/Test/Fixture/LinkOrderFixture.php @@ -0,0 +1,53 @@ + +* @link http://www.netcommons.org NetCommons Project +* @license http://www.netcommons.org/license.txt NetCommons License + */ + +/** + * Summary for LinkOrderFixture + */ +class LinkOrderFixture extends CakeTestFixture { + +/** + * Fields + * + * @var array + */ + public $fields = array( + 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'key' => 'primary', 'comment' => 'ID | | | '), + 'link_key' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'link key | リンクKey | links.key | ', 'charset' => 'utf8'), + 'link_category_key' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'category key | カテゴリーKey | link_categories.key | ', 'charset' => 'utf8'), + 'weight' => array('type' => 'integer', 'null' => false, 'default' => '0', 'comment' => 'The weight of the display(display order) | 表示の重み(表示順序) | | '), + 'created_user' => array('type' => 'integer', 'null' => true, 'default' => '0', 'comment' => 'created user | 作成者 | users.id | '), + 'created' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => 'created datetime | 作成日時 | | '), + 'modified_user' => array('type' => 'integer', 'null' => true, 'default' => '0', 'comment' => 'modified user | 更新者 | users.id | '), + 'modified' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => 'modified datetime | 更新日時 | | '), + 'indexes' => array( + 'PRIMARY' => array('column' => 'id', 'unique' => 1) + ), + 'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB') + ); + +/** + * Records + * + * @var array + */ + public $records = array( + array( + 'id' => 1, + 'link_key' => 'Lorem ipsum dolor sit amet', + 'link_category_key' => 'Lorem ipsum dolor sit amet', + 'weight' => 1, + 'created_user' => 1, + 'created' => '2014-10-25 04:56:40', + 'modified_user' => 1, + 'modified' => '2014-10-25 04:56:40' + ), + ); + +} From 03118ff4c6016dd1ff54b08aaaf2b7a221169ef1 Mon Sep 17 00:00:00 2001 From: RyujiAMANO Date: Mon, 27 Oct 2014 15:06:18 +0900 Subject: [PATCH 39/53] =?UTF-8?q?=E5=90=84=E3=83=A2=E3=83=87=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E3=82=A2=E3=82=BD=E3=82=B7=E3=82=A8=E3=83=BC=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E8=A8=AD=E5=AE=9A=E3=81=A8=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Link.php | 7 +++++ Model/LinkCategory.php | 5 ++++ Test/Case/Model/LinkCategoryTest.php | 20 +++++++++++++ Test/Case/Model/LinkTest.php | 9 ++++++ Test/Fixture/LinkCategoryFixture.php | 26 ++++++++++++++++- Test/Fixture/LinkCategoryOrderFixture.php | 12 +++++++- Test/Fixture/LinkFixture.php | 34 ++++++++++++++++++++++- Test/Fixture/LinkOrderFixture.php | 12 +++++++- 8 files changed, 121 insertions(+), 4 deletions(-) diff --git a/Model/Link.php b/Model/Link.php index 38a5ef2..d1fed90 100644 --- a/Model/Link.php +++ b/Model/Link.php @@ -88,7 +88,14 @@ class Link extends LinksAppModel { 'conditions' => '', 'fields' => '', 'order' => '' + ), + 'LinkOrder' => array( + 'className' => 'LinkOrder', + 'foreignKey' => false, + 'conditions' => array('Link.key = LinkOrder.link_key'), ) + + ); public function getLinks($blockId, $contentEditable){ diff --git a/Model/LinkCategory.php b/Model/LinkCategory.php index b2dc2f5..a185b3b 100644 --- a/Model/LinkCategory.php +++ b/Model/LinkCategory.php @@ -69,6 +69,11 @@ class LinkCategory extends LinksAppModel { 'conditions' => '', 'fields' => '', 'order' => '' + ), + 'LinkCategoryOrder' => array( + 'className' => 'LinkCategoryOrder', + 'foreignKey' => false, + 'conditions' => array('LinkCategory.key = LinkCategoryOrder.link_category_key'), ) ); diff --git a/Test/Case/Model/LinkCategoryTest.php b/Test/Case/Model/LinkCategoryTest.php index 1882a05..880de05 100644 --- a/Test/Case/Model/LinkCategoryTest.php +++ b/Test/Case/Model/LinkCategoryTest.php @@ -21,6 +21,7 @@ class LinkCategoryTest extends CakeTestCase { */ public $fixtures = array( 'plugin.links.link_category', + 'plugin.links.link_category_order', 'plugin.links.block', 'plugin.links.link' ); @@ -46,4 +47,23 @@ public function tearDown() { parent::tearDown(); } + + public function testAssociationLinkCategoryOrder() { + $linkCategory = $this->LinkCategory->findById(1); + $this->assertEqual($linkCategory['LinkCategoryOrder']['id'], 1); + + $linkCategory = $this->LinkCategory->findById(2); + $this->assertEqual($linkCategory['LinkCategoryOrder']['id'], 2); + + $linkCategory = $this->LinkCategory->findById(3); + $this->assertEqual($linkCategory['LinkCategoryOrder']['id'], 1); + } + + public function testAssociationLink() { + $linkCategory = $this->LinkCategory->findById(1); + $this->assertEqual(count($linkCategory['Link']), 2); + + $linkCategory = $this->LinkCategory->findById(2); + $this->assertEqual(count($linkCategory['Link']), 1); + } } diff --git a/Test/Case/Model/LinkTest.php b/Test/Case/Model/LinkTest.php index 8c05fcc..62f49e2 100644 --- a/Test/Case/Model/LinkTest.php +++ b/Test/Case/Model/LinkTest.php @@ -21,6 +21,7 @@ class LinkTest extends CakeTestCase { */ public $fixtures = array( 'plugin.links.link', + 'plugin.links.link_order', 'plugin.links.link_category' ); @@ -45,4 +46,12 @@ public function tearDown() { parent::tearDown(); } + public function testAssociationLinkOrder() { + $link = $this->Link->findById(1); + $this->assertEqual($link['LinkOrder']['id'], 1); + + $link = $this->Link->findById(2); + $this->assertEqual($link['LinkOrder']['id'], 2); + } + } diff --git a/Test/Fixture/LinkCategoryFixture.php b/Test/Fixture/LinkCategoryFixture.php index 13b3cd8..1aa6f9a 100644 --- a/Test/Fixture/LinkCategoryFixture.php +++ b/Test/Fixture/LinkCategoryFixture.php @@ -43,7 +43,19 @@ class LinkCategoryFixture extends CakeTestFixture { array( 'id' => 1, 'block_id' => 1, - 'key' => 'Lorem ipsum dolor sit amet', + 'key' => 'key1', + 'name' => '株式会社RYUS', + 'is_auto_translated' => 1, + 'translation_engine' => 'Lorem ipsum dolor sit amet', + 'created_user' => 1, + 'created' => '2014-10-25 04:56:24', + 'modified_user' => 1, + 'modified' => '2014-10-25 04:56:24' + ), + array( + 'id' => 2, + 'block_id' => 1, + 'key' => 'key2', 'name' => 'Lorem ipsum dolor sit amet', 'is_auto_translated' => 1, 'translation_engine' => 'Lorem ipsum dolor sit amet', @@ -52,6 +64,18 @@ class LinkCategoryFixture extends CakeTestFixture { 'modified_user' => 1, 'modified' => '2014-10-25 04:56:24' ), + array( + 'id' => 3, + 'block_id' => 1, + 'key' => 'key1', + 'name' => 'RYUS INC', + 'is_auto_translated' => 1, + 'translation_engine' => 'Lorem ipsum dolor sit amet', + 'created_user' => 1, + 'created' => '2014-10-25 04:56:24', + 'modified_user' => 1, + 'modified' => '2014-10-25 04:56:24' + ), ); } diff --git a/Test/Fixture/LinkCategoryOrderFixture.php b/Test/Fixture/LinkCategoryOrderFixture.php index 1bc4497..f3cd5a3 100644 --- a/Test/Fixture/LinkCategoryOrderFixture.php +++ b/Test/Fixture/LinkCategoryOrderFixture.php @@ -40,7 +40,17 @@ class LinkCategoryOrderFixture extends CakeTestFixture { public $records = array( array( 'id' => 1, - 'link_category_key' => 'Lorem ipsum dolor sit amet', + 'link_category_key' => 'key1', + 'block_key' => 'Lorem ipsum dolor sit amet', + 'weight' => 1, + 'created_user' => 1, + 'created' => '2014-10-25 04:56:50', + 'modified_user' => 1, + 'modified' => '2014-10-25 04:56:50' + ), + array( + 'id' => 2, + 'link_category_key' => 'key2', 'block_key' => 'Lorem ipsum dolor sit amet', 'weight' => 1, 'created_user' => 1, diff --git a/Test/Fixture/LinkFixture.php b/Test/Fixture/LinkFixture.php index c39f756..a0135f8 100644 --- a/Test/Fixture/LinkFixture.php +++ b/Test/Fixture/LinkFixture.php @@ -47,7 +47,39 @@ class LinkFixture extends CakeTestFixture { array( 'id' => 1, 'link_category_id' => 1, - 'key' => 'Lorem ipsum dolor sit amet', + 'key' => 'key1', + 'status' => 1, + 'url' => 'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.', + 'title' => 'Lorem ipsum dolor sit amet', + 'description' => 'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.', + 'click_number' => 1, + 'is_auto_translated' => 1, + 'translation_engine' => 'Lorem ipsum dolor sit amet', + 'created_user' => 1, + 'created' => '2014-10-25 04:56:32', + 'modified_user' => 1, + 'modified' => '2014-10-25 04:56:32' + ), + array( + 'id' => 2, + 'link_category_id' => 1, + 'key' => 'key2', + 'status' => 1, + 'url' => 'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.', + 'title' => 'Lorem ipsum dolor sit amet', + 'description' => 'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.', + 'click_number' => 1, + 'is_auto_translated' => 1, + 'translation_engine' => 'Lorem ipsum dolor sit amet', + 'created_user' => 1, + 'created' => '2014-10-25 04:56:32', + 'modified_user' => 1, + 'modified' => '2014-10-25 04:56:32' + ), + array( + 'id' => 3, + 'link_category_id' => 2, + 'key' => 'key3', 'status' => 1, 'url' => 'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.', 'title' => 'Lorem ipsum dolor sit amet', diff --git a/Test/Fixture/LinkOrderFixture.php b/Test/Fixture/LinkOrderFixture.php index f93a785..c014ed0 100644 --- a/Test/Fixture/LinkOrderFixture.php +++ b/Test/Fixture/LinkOrderFixture.php @@ -40,7 +40,17 @@ class LinkOrderFixture extends CakeTestFixture { public $records = array( array( 'id' => 1, - 'link_key' => 'Lorem ipsum dolor sit amet', + 'link_key' => 'key1', + 'link_category_key' => 'Lorem ipsum dolor sit amet', + 'weight' => 1, + 'created_user' => 1, + 'created' => '2014-10-25 04:56:40', + 'modified_user' => 1, + 'modified' => '2014-10-25 04:56:40' + ), + array( + 'id' => 2, + 'link_key' => 'key2', 'link_category_key' => 'Lorem ipsum dolor sit amet', 'weight' => 1, 'created_user' => 1, From 56726a3c284c6e6332afc7cc43f8939825bc89ae Mon Sep 17 00:00:00 2001 From: RyujiAMANO Date: Wed, 29 Oct 2014 10:13:35 +0900 Subject: [PATCH 40/53] =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/LinksController.php | 28 +++++++---- Model/Link.php | 21 +++----- Model/LinkCategory.php | 23 +++++---- Test/Case/Model/LinkCategoryTest.php | 9 ++++ Test/Case/Model/LinkTest.php | 40 +++++++++++++++- Test/Fixture/LinkCategoryFixture.php | 2 +- Test/Fixture/LinkCategoryOrderFixture.php | 2 +- Test/Fixture/LinkFixture.php | 9 ++-- Test/Fixture/LinkOrderFixture.php | 12 ++++- View/Elements/Links/list.ctp | 58 +++++++++++------------ View/Helper/LinksStatusHelper.php | 32 +++++++++++++ 11 files changed, 166 insertions(+), 70 deletions(-) create mode 100644 View/Helper/LinksStatusHelper.php diff --git a/Controller/LinksController.php b/Controller/LinksController.php index abebaad..da89d7d 100644 --- a/Controller/LinksController.php +++ b/Controller/LinksController.php @@ -15,9 +15,12 @@ * * @author Ryuji AMANO * @package NetCommons\Links\Controller + * + * @property Link $Links */ class LinksController extends LinksAppController { +public $helpers = array('Links.LinksStatus'); /** * use model * @@ -25,6 +28,7 @@ class LinksController extends LinksAppController { */ public $uses = array( 'Links.Link', + 'Links.LinkCategory', ); /** @@ -32,6 +36,7 @@ class LinksController extends LinksAppController { * * @var array */ + public $components = array( 'NetCommons.NetCommonsBlock', //use Announcement model 'NetCommons.NetCommonsFrame', @@ -69,17 +74,20 @@ public function beforeFilter() { */ public function index($frameId = 0, $type = 'list') { $this->set('type', $type); - - //Linkデータを取得 - $links = $this->Link->getLinks( - $this->viewVars['blockId'], - $this->viewVars['contentEditable'] + // カテゴリ一覧を取得 + $categories = $this->LinkCategory->getCategories( + $this->viewVars['blockId'] // MyTodo まだブロックレコードがないときは0なので、どうする？s ); - - //Announcementデータをviewにセット - $this->set('links', $links); - - + foreach($categories as &$category){ + //Linkデータを取得 + $links = $this->Link->getLinksByCategoryId( + $category['LinkCategory']['id'], + $this->viewVars['blockId'], + $this->viewVars['contentEditable'] + ); + $category['links'] = $links; + } + $this->set('categories', $categories); return $this->render('Links/index'); } diff --git a/Model/Link.php b/Model/Link.php index d1fed90..b99f805 100644 --- a/Model/Link.php +++ b/Model/Link.php @@ -83,14 +83,14 @@ class Link extends LinksAppModel { */ public $belongsTo = array( 'LinkCategory' => array( - 'className' => 'LinkCategory', + 'className' => 'Links.LinkCategory', 'foreignKey' => 'link_category_id', 'conditions' => '', 'fields' => '', 'order' => '' ), 'LinkOrder' => array( - 'className' => 'LinkOrder', + 'className' => 'Links.LinkOrder', 'foreignKey' => false, 'conditions' => array('Link.key = LinkOrder.link_key'), ) @@ -98,9 +98,10 @@ class Link extends LinksAppModel { ); - public function getLinks($blockId, $contentEditable){ + public function getLinksByCategoryId($categoryId, $blockId, $contentEditable){ $conditions = array( -// 'block_id' => $blockId, + 'link_category_id' => $categoryId, + 'LinkCategory.block_id' => $blockId, ); if (! $contentEditable) { $conditions['status'] = NetCommonsBlockComponent::STATUS_PUBLISHED; @@ -108,20 +109,12 @@ public function getLinks($blockId, $contentEditable){ $links = $this->find('all', array( 'conditions' => $conditions, -// 'order' => 'id' . '.id DESC', + 'order' => 'LinkOrder.weight ASC', ) ); -// if (! $links) { -// $links = $this->create(); -// $links['Link']['content'] = ''; -// $links['Link']['status'] = '0'; -// $links['Link']['block_id'] = '0'; -// $links['Link']['key'] = ''; -// $links['Link']['id'] = '0'; -// } - return $links; } + } diff --git a/Model/LinkCategory.php b/Model/LinkCategory.php index a185b3b..13b3850 100644 --- a/Model/LinkCategory.php +++ b/Model/LinkCategory.php @@ -2,6 +2,8 @@ /** * LinkCategory Model * + * 前提条件　ユニーク制約 (key and block_id) + * * @property Block $Block * @property Link $Link * @@ -71,7 +73,7 @@ class LinkCategory extends LinksAppModel { 'order' => '' ), 'LinkCategoryOrder' => array( - 'className' => 'LinkCategoryOrder', + 'className' => 'Links.LinkCategoryOrder', 'foreignKey' => false, 'conditions' => array('LinkCategory.key = LinkCategoryOrder.link_category_key'), ) @@ -84,7 +86,7 @@ class LinkCategory extends LinksAppModel { */ public $hasMany = array( 'Link' => array( - 'className' => 'Link', + 'className' => 'Links.Link', 'foreignKey' => 'link_category_id', 'dependent' => false, 'conditions' => '', @@ -97,19 +99,24 @@ class LinkCategory extends LinksAppModel { 'counterQuery' => '' ) ); - public function getPublished($blockId, $contentEditable){ + + + public $actsAs = array('Containable'); + + public function getCategories($blockId){ $conditions = array( 'block_id' => $blockId, ); - // カテゴリにはステータスがない -// if (! $contentEditable) { -// $conditions['status'] = NetCommonsBlockComponent::STATUS_PUBLISHED; -// } + + $this->unbindModel(array( + 'belongsTo' => array('Block'), + 'hasMany' => array('Link'), + )); // ソート順はlink_category_ordersテーブル参照 $categories = $this->find('all', array( 'conditions' => $conditions, -// 'order' => 'Link' . '.id DESC', + 'order' => 'LinkCategoryOrder.weight ASC', ) ); diff --git a/Test/Case/Model/LinkCategoryTest.php b/Test/Case/Model/LinkCategoryTest.php index 880de05..90933f1 100644 --- a/Test/Case/Model/LinkCategoryTest.php +++ b/Test/Case/Model/LinkCategoryTest.php @@ -11,6 +11,8 @@ /** * Summary for LinkCategory Test Case + * + * @property LinkCategory $LinkCategory */ class LinkCategoryTest extends CakeTestCase { @@ -66,4 +68,11 @@ public function testAssociationLink() { $linkCategory = $this->LinkCategory->findById(2); $this->assertEqual(count($linkCategory['Link']), 1); } + + public function testGetCategories() { + $blockId = 1; + $categories = $this->LinkCategory->getCategories($blockId); + $this->assertEqual($categories[0]['LinkCategory']['id'], 2); + $this->assertEqual($categories[1]['LinkCategory']['id'], 1); + } } diff --git a/Test/Case/Model/LinkTest.php b/Test/Case/Model/LinkTest.php index 62f49e2..8337367 100644 --- a/Test/Case/Model/LinkTest.php +++ b/Test/Case/Model/LinkTest.php @@ -11,6 +11,8 @@ /** * Summary for Link Test Case + * + * @property Link $Link */ class LinkTest extends CakeTestCase { @@ -22,7 +24,9 @@ class LinkTest extends CakeTestCase { public $fixtures = array( 'plugin.links.link', 'plugin.links.link_order', - 'plugin.links.link_category' + 'plugin.links.link_category', + 'plugin.links.link_category_order', + 'plugin.links.block', ); /** @@ -54,4 +58,38 @@ public function testAssociationLinkOrder() { $this->assertEqual($link['LinkOrder']['id'], 2); } + public function testAssociationLinkCategory() { + $link = $this->Link->findById(1); + $this->assertEqual($link['LinkCategory']['id'], 1); + } + + + public function testGetLinksByCategoryId() { + $categoryId = 1; + $blockId = 1; + $contentEditable = true; + + // + $links = $this->Link->getLinksByCategoryId($categoryId, $blockId, $contentEditable); + + $this->assertEqual(count($links), 2); + } + public function testGetLinksByCategoryId4NotEditable() { + $categoryId = 1; + $blockId = 1; + $contentEditable = false; + $links = $this->Link->getLinksByCategoryId($categoryId, $blockId, $contentEditable); + $this->assertEqual(count($links), 1); + } + // リンクがオーダー順にとれてるか + public function testGetLinksByCategoryIdOrderWight() { + $categoryId = 1; + $blockId = 1; + $contentEditable = true; + $links = $this->Link->getLinksByCategoryId($categoryId, $blockId, $contentEditable); + + $this->assertEqual($links[0]['Link']['id'] , 2); + $this->assertEqual($links[1]['Link']['id'] , 1); + } + } diff --git a/Test/Fixture/LinkCategoryFixture.php b/Test/Fixture/LinkCategoryFixture.php index 1aa6f9a..57fcfb7 100644 --- a/Test/Fixture/LinkCategoryFixture.php +++ b/Test/Fixture/LinkCategoryFixture.php @@ -66,7 +66,7 @@ class LinkCategoryFixture extends CakeTestFixture { ), array( 'id' => 3, - 'block_id' => 1, + 'block_id' => 2, 'key' => 'key1', 'name' => 'RYUS INC', 'is_auto_translated' => 1, diff --git a/Test/Fixture/LinkCategoryOrderFixture.php b/Test/Fixture/LinkCategoryOrderFixture.php index f3cd5a3..4d9add5 100644 --- a/Test/Fixture/LinkCategoryOrderFixture.php +++ b/Test/Fixture/LinkCategoryOrderFixture.php @@ -42,7 +42,7 @@ class LinkCategoryOrderFixture extends CakeTestFixture { 'id' => 1, 'link_category_key' => 'key1', 'block_key' => 'Lorem ipsum dolor sit amet', - 'weight' => 1, + 'weight' => 2, 'created_user' => 1, 'created' => '2014-10-25 04:56:50', 'modified_user' => 1, diff --git a/Test/Fixture/LinkFixture.php b/Test/Fixture/LinkFixture.php index a0135f8..bbf6c82 100644 --- a/Test/Fixture/LinkFixture.php +++ b/Test/Fixture/LinkFixture.php @@ -7,6 +7,9 @@ * @license http://www.netcommons.org/license.txt NetCommons License */ +App::uses('Link', 'Links.Model'); +App::uses('NetCommonsBlockComponent', 'NetCommons.Controller/Component'); + /** * Summary for LinkFixture */ @@ -48,7 +51,7 @@ class LinkFixture extends CakeTestFixture { 'id' => 1, 'link_category_id' => 1, 'key' => 'key1', - 'status' => 1, + 'status' => NetCommonsBlockComponent::STATUS_PUBLISHED, 'url' => 'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.', 'title' => 'Lorem ipsum dolor sit amet', 'description' => 'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.', @@ -64,7 +67,7 @@ class LinkFixture extends CakeTestFixture { 'id' => 2, 'link_category_id' => 1, 'key' => 'key2', - 'status' => 1, + 'status' => NetCommonsBlockComponent::STATUS_DRAFTED, 'url' => 'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.', 'title' => 'Lorem ipsum dolor sit amet', 'description' => 'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.', @@ -80,7 +83,7 @@ class LinkFixture extends CakeTestFixture { 'id' => 3, 'link_category_id' => 2, 'key' => 'key3', - 'status' => 1, + 'status' => NetCommonsBlockComponent::STATUS_PUBLISHED, 'url' => 'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.', 'title' => 'Lorem ipsum dolor sit amet', 'description' => 'Lorem ipsum dolor sit amet, aliquet feugiat. Convallis morbi fringilla gravida, phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla vestibulum massa neque ut et, id hendrerit sit, feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.', diff --git a/Test/Fixture/LinkOrderFixture.php b/Test/Fixture/LinkOrderFixture.php index c014ed0..bc9d06d 100644 --- a/Test/Fixture/LinkOrderFixture.php +++ b/Test/Fixture/LinkOrderFixture.php @@ -42,7 +42,7 @@ class LinkOrderFixture extends CakeTestFixture { 'id' => 1, 'link_key' => 'key1', 'link_category_key' => 'Lorem ipsum dolor sit amet', - 'weight' => 1, + 'weight' => 10, 'created_user' => 1, 'created' => '2014-10-25 04:56:40', 'modified_user' => 1, @@ -58,6 +58,16 @@ class LinkOrderFixture extends CakeTestFixture { 'modified_user' => 1, 'modified' => '2014-10-25 04:56:40' ), + array( + 'id' => 3, + 'link_key' => 'key3', + 'link_category_key' => 'Lorem ipsum dolor sit amet', + 'weight' => 5, + 'created_user' => 1, + 'created' => '2014-10-25 04:56:40', + 'modified_user' => 1, + 'modified' => '2014-10-25 04:56:40' + ), ); } diff --git a/View/Elements/Links/list.ctp b/View/Elements/Links/list.ctp index b48993d..72c5d38 100644 --- a/View/Elements/Links/list.ctp +++ b/View/Elements/Links/list.ctp @@ -1,35 +1,31 @@ - +
        -
        diff --git a/View/Helper/LinksStatusHelper.php b/View/Helper/LinksStatusHelper.php new file mode 100644 index 0000000..ee17044 --- /dev/null +++ b/View/Helper/LinksStatusHelper.php @@ -0,0 +1,32 @@ +申請中'; + break; + case NetCommonsBlockComponent::STATUS_DISAPPROVED: + $ret = '差し戻し'; + break; + case NetCommonsBlockComponent::STATUS_DRAFTED: + $ret = '下書き'; + break; + default: + $ret = ''; + + } + return $ret; + } +} \ No newline at end of file From 181fed78470b9c6502cca191114e6f5599ba5b98 Mon Sep 17 00:00:00 2001 From: RyujiAMANO Date: Thu, 30 Oct 2014 09:36:18 +0900 Subject: [PATCH 41/53] =?UTF-8?q?=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0JS=E5=AE=9F=E8=A3=85=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/LinkCategoryController.php | 55 ++++++++++++++ Controller/LinksController.php | 1 + View/Elements/Links/dropdown.ctp | 90 +++++++++++++++-------- View/LinkCategory/form.ctp | 45 ++++++++++++ View/LinkCategory/view.ctp | 8 +- webroot/js/links.js | 102 +++++++++++++++++++++++++- 6 files changed, 268 insertions(+), 33 deletions(-) create mode 100644 View/LinkCategory/form.ctp diff --git a/Controller/LinkCategoryController.php b/Controller/LinkCategoryController.php index 1ea320c..ee4b13b 100644 --- a/Controller/LinkCategoryController.php +++ b/Controller/LinkCategoryController.php @@ -43,6 +43,23 @@ class LinkCategoryController extends LinksAppController { public function beforeFilter() { parent::beforeFilter(); $this->Auth->allow(); + $frameId = (isset($this->params['pass'][0]) ? (int)$this->params['pass'][0] : 0); + + //Roleのデータをviewにセット + if (! $this->NetCommonsRoomRole->setView($this)) { + throw new ForbiddenException(); + } + + //編集権限チェック + if (! $this->viewVars['contentEditable']) { + throw new ForbiddenException(); + } + + //Frameのデータをviewにセット + if (! $this->NetCommonsFrame->setView($this, $frameId)) { + throw new ForbiddenException(); + } + } /** @@ -59,4 +76,42 @@ public function view($frameId = 0, $type = 'list') { return $this->render('LinkCategory/view', false); } +/** +* form method +* +* @param int $frameId frames.id +* @return CakeResponse A response object containing the rendered view. +*/ + public function form($frameId = 0) { +// $this->view($frameId); + return $this->render('LinkCategory/form', false); + } + + public function add($frameId = 0) { + if (! $this->request->isPost()) { + throw new MethodNotAllowedException(); + } + + $postData = $this->data; +// unset($postData['Announcement']['id']); + + //保存 + if ($this->LinkCategory->save($postData)) { +// $announcement = $this->Announcement->getAnnouncement( +// $this->viewVars['blockId'], +// $this->viewVars['contentEditable'] +// ); + + $result = array( + 'name' => __d('net_commons', 'Successfully finished.'), + 'link_category' => $postData, + ); + + $this->set(compact('result')); + $this->set('_serialize', 'result'); + return $this->render(false); + } else { + throw new ForbiddenException(__d('net_commons', 'Failed to register data.')); + } + } } diff --git a/Controller/LinksController.php b/Controller/LinksController.php index da89d7d..2e6a5eb 100644 --- a/Controller/LinksController.php +++ b/Controller/LinksController.php @@ -73,6 +73,7 @@ public function beforeFilter() { * @return CakeResponse A response object containing the rendered view. */ public function index($frameId = 0, $type = 'list') { +// $type = 'dropdown'; $this->set('type', $type); // カテゴリ一覧を取得 $categories = $this->LinkCategory->getCategories( diff --git a/View/Elements/Links/dropdown.ctp b/View/Elements/Links/dropdown.ctp index c556d07..439d32c 100644 --- a/View/Elements/Links/dropdown.ctp +++ b/View/Elements/Links/dropdown.ctp @@ -1,38 +1,70 @@ + + +
        +
        - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        diff --git a/View/LinkCategory/form.ctp b/View/LinkCategory/form.ctp new file mode 100644 index 0000000..6aec635 --- /dev/null +++ b/View/LinkCategory/form.ctp @@ -0,0 +1,45 @@ +Form->create(null); + +echo $this->Form->input('LinkCategory.name', array( + 'type' => 'text', + 'value' => '', + 'ng-model' => 'edit.data.LinkCategory.name' + ) +); + +//if ($contentPublishable) { +// $options = array( +// NetCommonsBlockComponent::STATUS_PUBLISHED, +// NetCommonsBlockComponent::STATUS_DRAFTED, +// NetCommonsBlockComponent::STATUS_DISAPPROVED, +// ); +//} else { +// $options = array( +// NetCommonsBlockComponent::STATUS_APPROVED, +// NetCommonsBlockComponent::STATUS_DRAFTED, +// ); +//} +//echo $this->Form->input('Announcement.status', array( +// 'type' => 'select', +// 'options' => array_combine($options, $options) +// ) +// ); + +//echo $this->element('AnnouncementEdit/common_form'); +echo $this->Form->input('Frame.frame_id', array( + 'type' => 'hidden', + 'value' => (int)$frameId, + 'ng-model' => 'edit.data.Frame.frame_id' + ) +); + +//echo $this->Form->input('LinkCategory.block_id', array( +// 'type' => 'hidden', +// 'value' => (int)$blockId, +// 'ng-model' => 'edit.data.LinkCategory.block_id', +// ) +//); + +echo $this->Form->end(); diff --git a/View/LinkCategory/view.ctp b/View/LinkCategory/view.ctp index 0f42fda..12efada 100644 --- a/View/LinkCategory/view.ctp +++ b/View/LinkCategory/view.ctp @@ -45,21 +45,23 @@
        -
        +
        Form->input('category_name.0', array( +// echo $this->Form->input('category_name.0', array( + echo $this->Form->input('LinkCategory.name', array( 'label' => false, 'type' => 'text', 'class' => 'form-control', 'value' => '', + 'ng-model' => 'edit.data.LinkCategory.name', ) ); ?>
        - diff --git a/webroot/js/links.js b/webroot/js/links.js index 4f9df62..219c769 100644 --- a/webroot/js/links.js +++ b/webroot/js/links.js @@ -106,6 +106,46 @@ NetCommonsApp.controller('Links.linkAdd', NetCommonsApp.controller('Links.edit', function($scope, $http, $sce, $modalInstance, $timeout, dialogs) { + /** + * edit _method + * + * @type {Object.} + */ + $scope.edit = { + _method: 'POST' + }; + + /** + * edit data + * + * @type {Object.} + */ + $scope.edit.data = { + LinkCategory: { +// name: $scope.link.LinkCategory.name, + name: '' +// content: $scope.announcement.Announcement.content, +// status: $scope.announcement.Announcement.status, +// block_id: $scope.announcement.Announcement.block_id, +// key: $scope.announcement.Announcement.key, +// id: $scope.announcement.Announcement.id + }, + Frame: { + frame_id: $scope.frameId//フレームIDが不一致かーーーーー + }, + _Token: { + key: '', + fields: '', + unlocked: '' + } + }; + + $scope.initialize = function(frameId) { + $scope.frameId = frameId; + }; + + + $scope.cancel = function(){ $modalInstance.dismiss('cancel'); }; @@ -143,5 +183,65 @@ NetCommonsApp.controller('Links.edit', function(btn){} // NO ); }; - }); + + /** + * dialog save + * + * @return {void} + */ + $scope.addCategory = function() { + $scope.sending = true; + + $http.get('/links/link_category/form/' + + $scope.frameId + '/' + Math.random() + '.json') + .success(function(data) { + //フォームエレメント生成 + var form = $('
        ').html(data); + + //セキュリティキーセット + $scope.edit.data._Token.key = + $(form).find('input[name="data[_Token][key]"]').val(); + $scope.edit.data._Token.fields = + $(form).find('input[name="data[_Token][fields]"]').val(); + $scope.edit.data._Token.unlocked = + $(form).find('input[name="data[_Token][unlocked]"]').val(); + //ステータスセット +// $scope.edit.data.Announcement.status = status; + //登録情報をPOST + $scope.sendCategoryPost($scope.edit); + }) + .error(function(data, status) { + //keyの取得に失敗 + $scope.flash.danger(status + ' ' + data.name); + $scope.sending = false; + }); + }; + + /** + * send post + * + * @param {Object.} postParams + * @return {void} + */ + $scope.sendCategoryPost = function(postParams) { + //$http.post($scope.PLUGIN_EDIT_URL + Math.random() + '.json', + $http.post('/links/link_category/add/' + + $scope.frameId + '/' + Math.random() + '.json', + //$.param(postParams)) + //{data: postParams}) + //postParams) + $.param(postParams), + {headers: {'Content-Type': 'application/x-www-form-urlencoded'}}) + .success(function(data) { + $scope.flash.success(data.name); + $modalInstance.close(data.announcement); + }) + .error(function(data, status) { + $scope.flash.danger(status + ' ' + data.name); + $scope.sending = false; + }); + }; + + } +); From df3194f5991d72095da45fa3f926f8258f105115 Mon Sep 17 00:00:00 2001 From: RyujiAMANO Date: Thu, 30 Oct 2014 10:20:20 +0900 Subject: [PATCH 42/53] =?UTF-8?q?=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/LinkCategoryController.php | 3 +- Model/LinkCategory.php | 80 +++++++++++++++++++++++++++ Model/LinkCategoryOrder.php | 27 +++++++++ 3 files changed, 108 insertions(+), 2 deletions(-) diff --git a/Controller/LinkCategoryController.php b/Controller/LinkCategoryController.php index ee4b13b..766f969 100644 --- a/Controller/LinkCategoryController.php +++ b/Controller/LinkCategoryController.php @@ -83,7 +83,6 @@ public function view($frameId = 0, $type = 'list') { * @return CakeResponse A response object containing the rendered view. */ public function form($frameId = 0) { -// $this->view($frameId); return $this->render('LinkCategory/form', false); } @@ -96,7 +95,7 @@ public function add($frameId = 0) { // unset($postData['Announcement']['id']); //保存 - if ($this->LinkCategory->save($postData)) { + if ($this->LinkCategory->saveLinkCategory($postData)) { // $announcement = $this->Announcement->getAnnouncement( // $this->viewVars['blockId'], // $this->viewVars['contentEditable'] diff --git a/Model/LinkCategory.php b/Model/LinkCategory.php index 13b3850..b6535aa 100644 --- a/Model/LinkCategory.php +++ b/Model/LinkCategory.php @@ -123,4 +123,84 @@ public function getCategories($blockId){ return $categories; } + public function saveLinkCategory($postData){ + $models = array( + 'Frame' => 'Frames.Frame', + 'Block' => 'Blocks.Block', + ); + foreach ($models as $model => $class) { + $this->$model = ClassRegistry::init($class); + $this->$model->setDataSource('master'); + } + + //frame関連のセット + $frame = $this->Frame->findById($postData['Frame']['frame_id']); + if (! $frame) { + return false; + } + if (! isset($frame['Frame']['block_id']) || + $frame['Frame']['block_id'] === '0') { + //generate link_categories.key + } + + //DBへの登録 + $dataSource = $this->getDataSource(); + $dataSource->begin(); + try { + $blockId = $this->__saveBlock($frame); + + //announcementsテーブル登録 + $linkCategory['LinkCategory'] = $postData['LinkCategory']; + $linkCategory['LinkCategory']['key'] = hash('sha256', 'link_category_' . microtime()); //新規時はkeyを新規に発行 + $linkCategory['LinkCategory']['block_id'] = $blockId; + $linkCategory['LinkCategory']['created_user'] = CakeSession::read('Auth.User.id'); + + + + if (! $this->save($linkCategory)) { + throw new ForbiddenException(serialize($this->validationErrors)); + } + $this->LinkCategoryOrder->addLinkCategoryOrder($linkCategory); + $dataSource->commit(); + return true; + + } catch (Exception $ex) { + CakeLog::error($ex->getTraceAsString()); + $dataSource->rollback(); + return false; + } + + } + + /** + * save block + * ブロックモデルが担当した方がいいんじゃね？ By Ryuji + * @param array $frame frame data + * @return int blocks.id + * @throws ForbiddenException + * + */ + private function __saveBlock($frame) { + if (! isset($frame['Frame']['block_id']) || + $frame['Frame']['block_id'] === '0') { + //blocksテーブル登録 + $block = array(); + $block['Block']['room_id'] = $frame['Frame']['room_id']; + $block['Block']['language_id'] = $frame['Frame']['language_id']; + $block = $this->Block->save($block); + if (! $block) { + throw new ForbiddenException(serialize($this->Block->validationErrors)); + } + $blockId = (int)$block['Block']['id']; + + //framesテーブル更新 + $frame['Frame']['block_id'] = $blockId; + if (! $this->Frame->save($frame)) { + throw new ForbiddenException(serialize($this->Frame->validationErrors)); + } + } + + return (int)$frame['Frame']['block_id']; + } + } diff --git a/Model/LinkCategoryOrder.php b/Model/LinkCategoryOrder.php index d16518e..2115fe1 100644 --- a/Model/LinkCategoryOrder.php +++ b/Model/LinkCategoryOrder.php @@ -52,4 +52,31 @@ class LinkCategoryOrder extends LinksAppModel { ), ), ); + + public function addLinkCategoryOrder($linkCategory){ + $Block = ClassRegistry::init('Block'); + $block = $Block->findById($linkCategory['LinkCategory']['block_id']); + + $linkCategoryOrder['LinkCategoryOrder']['link_category_key'] = $linkCategory['LinkCategory']['key']; + $linkCategoryOrder['LinkCategoryOrder']['block_key'] = $block['Block']['key']; + + $linkCategoryOrder['LinkCategoryOrder']['weight'] = $this->_getMaxWightByBlockKey($block['Block']['key']) + 1; + $linkCategoryOrder['LinkCategoryOrder']['created_user'] = CakeSession::read('Auth.User.id');; + + if (! $this->save($linkCategoryOrder)) { + throw new ForbiddenException(serialize($this->validationErrors)); + } + + } + + protected function _getMaxWightByBlockKey($blockKey) { + $options = array( + 'conditions' => array( + 'block_key' => $blockKey, + ), + 'order' => 'weight DESC' + ); + $linkCategoryOrder = $this->find('first', $options); + return $linkCategoryOrder['LinkCategoryOrder']['weight'] ; + } } From 704ed6a5e9ef60e2a16acd89cc42c3dfba8a2311 Mon Sep 17 00:00:00 2001 From: RyujiAMANO Date: Thu, 30 Oct 2014 18:49:04 +0900 Subject: [PATCH 43/53] =?UTF-8?q?=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA?= =?UTF-8?q?=E7=B7=A8=E9=9B=86=E7=94=BB=E9=9D=A2=E3=81=AE=E3=82=AB=E3=83=86?= =?UTF-8?q?=E3=82=B4=E3=83=AA=E4=B8=80=E8=A6=A7=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/LinkCategoryController.php | 8 ++++ View/Elements/content_move_btn.ctp | 10 +++-- View/LinkCategory/view.ctp | 65 ++++++++++++++------------- 3 files changed, 47 insertions(+), 36 deletions(-) diff --git a/Controller/LinkCategoryController.php b/Controller/LinkCategoryController.php index 766f969..b0db373 100644 --- a/Controller/LinkCategoryController.php +++ b/Controller/LinkCategoryController.php @@ -13,6 +13,8 @@ /** * LinkCategory Controller * + * @property LinkCategory $LinkCategory + * * @author Ryuji AMANO * @package NetCommons\Links\Controller */ @@ -74,6 +76,12 @@ public function view($frameId = 0, $type = 'list') { return $this->render(false); } + // カテゴリ取得 + $linkCategories = $this->LinkCategory->getCategories( + $this->viewVars['blockId'] // MyTodo まだブロックレコードがないときは0なので、どうする？ + ); + $this->set('linkCategories', $linkCategories); + return $this->render('LinkCategory/view', false); } /** diff --git a/View/Elements/content_move_btn.ctp b/View/Elements/content_move_btn.ctp index 24009b5..04a1a61 100644 --- a/View/Elements/content_move_btn.ctp +++ b/View/Elements/content_move_btn.ctp @@ -1,13 +1,15 @@ - +
        - - - diff --git a/View/LinkCategory/view.ctp b/View/LinkCategory/view.ctp index 12efada..382b231 100644 --- a/View/LinkCategory/view.ctp +++ b/View/LinkCategory/view.ctp @@ -1,46 +1,47 @@
        + -
        - element('content_move_btn', array('size' => '2 col-md-2', 'upDisabled' => true)); ?> + $keys = array_keys($linkCategories); + $firstKey = array_shift($keys); + $lastKey = array_pop($keys); + + foreach($linkCategories as $key => $linkCategory): ?> +
        +
        -
        element('content_move_btn', + array('size' => '2 col-md-2', 'upDisabled' => $upDisabled, 'downDisabled' => $downDisabled) + ); ?> + +
        + Form->input('category_name.1', array( - 'label' => false, - 'type' => 'text', - 'class' => 'form-control', - 'value' => 'カテゴリ１', - ) - ); - ?> -
        + 'label' => false, + 'type' => 'text', + 'class' => 'form-control', + 'value' => h($linkCategory['LinkCategory']['name']), + ) + ); + ?> +
        - element('LinkCategory/content_edit_btn_category', array('published' => false, 'size' => '2 col-md-1')); ?> + element('LinkCategory/content_edit_btn_category', array('published' => false, 'size' => '2 col-md-1')); ?> +
        -
        -
        -
        - element('content_move_btn', array('size' => '2 col-md-2', 'downDisabled' => true)); ?> + -
        - Form->input('category_name.2', array( - 'label' => false, - 'type' => 'text', - 'class' => 'form-control', - 'value' => 'カテゴリ２', - ) - ); - ?> -
        - element('LinkCategory/content_edit_btn_category', array('published' => false, 'size' => '2 col-md-1')); ?> -
        -
        From b18d1e96b006e7d2fe9fb2f15ad188db29693d02 Mon Sep 17 00:00:00 2001 From: RyujiAMANO Date: Tue, 4 Nov 2014 11:13:17 +0900 Subject: [PATCH 44/53] =?UTF-8?q?=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/LinkCategoryController.php | 40 ++++++++ Model/LinkCategory.php | 4 + Test/Case/Model/LinkCategoryTest.php | 32 ++++++ View/Elements/content_move_btn.ctp | 4 +- View/LinkCategory/categories_form.ctp | 45 +++++++++ View/LinkCategory/view.ctp | 40 ++++---- webroot/js/links.js | 139 +++++++++++++++++++++++++- 7 files changed, 280 insertions(+), 24 deletions(-) create mode 100644 View/LinkCategory/categories_form.ctp diff --git a/Controller/LinkCategoryController.php b/Controller/LinkCategoryController.php index b0db373..8d5c5c2 100644 --- a/Controller/LinkCategoryController.php +++ b/Controller/LinkCategoryController.php @@ -62,8 +62,10 @@ public function beforeFilter() { throw new ForbiddenException(); } + } + /** * view method * @@ -121,4 +123,42 @@ public function add($frameId = 0) { throw new ForbiddenException(__d('net_commons', 'Failed to register data.')); } } + + public function categories_form($frameId = 0){ + // カテゴリ取得 + $linkCategories = $this->LinkCategory->getCategories( + $this->viewVars['blockId'] // MyTodo まだブロックレコードがないときは0なので、どうする？ + ); + $this->set('linkCategories', $linkCategories); + return $this->render('LinkCategory/categories_form', false); + } + + public function update_all($frameId = 0) { + if (! $this->request->isPost()) { + throw new MethodNotAllowedException(); + } + + $postData = $this->data; +// unset($postData['Announcement']['id']); + + //保存 + if ($this->LinkCategory->updateCategories($postData)) { +// $announcement = $this->Announcement->getAnnouncement( +// $this->viewVars['blockId'], +// $this->viewVars['contentEditable'] +// ); + + $result = array( + 'name' => __d('net_commons', 'Successfully finished.'), +// 'link_category' => $postData, + ); + + $this->set(compact('result')); + $this->set('_serialize', 'result'); + return $this->render(false); + } else { + throw new ForbiddenException(__d('net_commons', 'Failed to register data.')); + } + + } } diff --git a/Model/LinkCategory.php b/Model/LinkCategory.php index b6535aa..7728774 100644 --- a/Model/LinkCategory.php +++ b/Model/LinkCategory.php @@ -172,6 +172,10 @@ public function saveLinkCategory($postData){ } + public function updateCategories($postData) { + return $this->saveMany($postData['LinkCategories'], array('deep' => true)); + } + /** * save block * ブロックモデルが担当した方がいいんじゃね？ By Ryuji diff --git a/Test/Case/Model/LinkCategoryTest.php b/Test/Case/Model/LinkCategoryTest.php index 90933f1..2fdfc23 100644 --- a/Test/Case/Model/LinkCategoryTest.php +++ b/Test/Case/Model/LinkCategoryTest.php @@ -75,4 +75,36 @@ public function testGetCategories() { $this->assertEqual($categories[0]['LinkCategory']['id'], 2); $this->assertEqual($categories[1]['LinkCategory']['id'], 1); } + + public function testUpdateCategories() { + $data = array( + array( + 'LinkCategory' => array( + + 'id' => 1, + 'name' => 'ID1DATA' + ), + 'LinkCategoryOrder' => array( + 'id' => 1, + 'weight' => 1 + ) + ), + array( + 'LinkCategory' => array( + + 'id' => 2, + 'name' => 'ID2DATA' + ), + 'LinkCategoryOrder' => array( + 'id' => 2, + 'weight' => 2 + ) + ), + ); + $resultTrue = $this->LinkCategory->updateCategories($data); + $this->assertTrue($resultTrue); + $linkCategory1 = $this->LinkCategory->findById(1); + $this->assertEqual($linkCategory1['LinkCategory']['name'], 'ID1DATA'); + + } } diff --git a/View/Elements/content_move_btn.ctp b/View/Elements/content_move_btn.ctp index 04a1a61..481ab2c 100644 --- a/View/Elements/content_move_btn.ctp +++ b/View/Elements/content_move_btn.ctp @@ -5,11 +5,11 @@ $downDisabled = isset($downDisabled) ? $downDisabled : false;
        - - diff --git a/View/LinkCategory/categories_form.ctp b/View/LinkCategory/categories_form.ctp new file mode 100644 index 0000000..b28f8b1 --- /dev/null +++ b/View/LinkCategory/categories_form.ctp @@ -0,0 +1,45 @@ +Form->create(null); + +$count = 0; + +//$linkCategories = array_fill(0, 7, array()); + +foreach($linkCategories as $linkCategory){ + echo $this->Form->input(sprintf('LinkCategories.%d.LinkCategory.id', $count), array( + 'type' => 'text', + 'value' => $linkCategory['LinkCategory']['id'] + ) + ); + echo $this->Form->input(sprintf('LinkCategories.%d.LinkCategory.name', $count), array( + 'type' => 'text', + ) + ); + echo $this->Form->input(sprintf('LinkCategories.%d.LinkCategoryOrder.id', $count), array( + 'type' => 'text', + 'value' => $linkCategory['LinkCategoryOrder']['id'] + ) + ); + echo $this->Form->input(sprintf('LinkCategories.%d.LinkCategoryOrder.weight', $count), array( + 'type' => 'text', + ) + ); + +$count++; +} + +echo $this->Form->input('Frame.frame_id', array( + 'type' => 'hidden', + 'value' => (int)$frameId, + 'ng-model' => 'edit.data.Frame.frame_id' + ) +); + + +echo $this->Form->end(); diff --git a/View/LinkCategory/view.ctp b/View/LinkCategory/view.ctp index 382b231..c3ce90e 100644 --- a/View/LinkCategory/view.ctp +++ b/View/LinkCategory/view.ctp @@ -1,25 +1,25 @@ -
        +
        $linkCategory): ?> +// foreach($linkCategories as $key => $linkCategory): ?>
        -
        +
        element('content_move_btn', - array('size' => '2 col-md-2', 'upDisabled' => $upDisabled, 'downDisabled' => $downDisabled) + array('size' => '2 col-md-2', 'upDisabled' => false, 'downDisabled' => false) ); ?>
        @@ -29,24 +29,24 @@ 'label' => false, 'type' => 'text', 'class' => 'form-control', - 'value' => h($linkCategory['LinkCategory']['name']), +// 'value' => h($linkCategory['LinkCategory']['name']), + 'ng-model' => 'linkCategory.LinkCategory.name' ) ); ?>
        - element('LinkCategory/content_edit_btn_category', array('published' => false, 'size' => '2 col-md-1')); ?>
        - +
        -
        +
        Form->input('category_name.0', array( @@ -78,7 +78,7 @@ -

        diff --git a/webroot/js/links.js b/webroot/js/links.js index 219c769..6a72c20 100644 --- a/webroot/js/links.js +++ b/webroot/js/links.js @@ -140,8 +140,57 @@ NetCommonsApp.controller('Links.edit', } }; - $scope.initialize = function(frameId) { + $scope.editCategories= { + _method: 'POST' + }; + + $scope.editCategories.data = { + LinkCategories:[], +// LinkCategory:[], +// LinkCategoryOrder:[], + Frame: { + frame_id: $scope.frameId//フレームIDが不一致かーーーーー + }, + _Token: { + key: '', + fields: '', + unlocked: '' + } + }; + + + $scope.initialize = function(frameId, linkCategories) { $scope.frameId = frameId; + angular.forEach(linkCategories, function(oneRecord){ + $scope.editCategories.data.LinkCategories.push( + { + LinkCategory: { + id: oneRecord.LinkCategory.id, + name: oneRecord.LinkCategory.name + }, + LinkCategoryOrder:{ + id:oneRecord.LinkCategoryOrder.id, + weight:oneRecord.LinkCategoryOrder.weight + + } + } + ) +// $scope.editCategories.data.LinkCategories.push(oneRecord) +// $scope.editCategories.data.LinkCategory.push( +// { +// id: oneRecord.LinkCategory.id, +// name: oneRecord.LinkCategory.name +// } +// ); +// $scope.editCategories.data.LinkCategoryOrder.push( +// { +// id:oneRecord.LinkCategoryOrder.id, +// weight:oneRecord.LinkCategoryOrder.weight +// } +// ); + }); +// $scope.editCategories.data.LinkCategories = linkCategories; + console.log($scope.editCategories.data.LinkCategories); }; @@ -184,6 +233,8 @@ NetCommonsApp.controller('Links.edit', ); }; + + /** * dialog save * @@ -234,7 +285,68 @@ NetCommonsApp.controller('Links.edit', {headers: {'Content-Type': 'application/x-www-form-urlencoded'}}) .success(function(data) { $scope.flash.success(data.name); - $modalInstance.close(data.announcement); + // MyTodo カテゴリ追加し終わったらカテゴリ一覧をリロードしたいよなぁ +// $modalInstance.close(data.announcement); + }) + .error(function(data, status) { + $scope.flash.danger(status + ' ' + data.name); + $scope.sending = false; + }); + }; + /** + * dialog save + * + * @return {void} + */ + $scope.updateCategories = function() { + $scope.sending = true; + + $http.get('/links/link_category/categories_form/' + + $scope.frameId + '/' + Math.random() + '.json') + .success(function(data) { + //フォームエレメント生成 + var form = $('
        ').html(data); + + //セキュリティキーセット + $scope.editCategories.data._Token.key = + $(form).find('input[name="data[_Token][key]"]').val(); + $scope.editCategories.data._Token.fields = + $(form).find('input[name="data[_Token][fields]"]').val(); + $scope.editCategories.data._Token.unlocked = + $(form).find('input[name="data[_Token][unlocked]"]').val(); + + //ステータスセット +// $scope.edit.data.Announcement.status = status; + //登録情報をPOST + $scope.sendCategoriesPost($scope.editCategories); + }) + .error(function(data, status) { + //keyの取得に失敗 + $scope.flash.danger(status + ' ' + data.name); + $scope.sending = false; + }); + }; + + /** + * send post + * + * @param {Object.} postParams + * @return {void} + */ + $scope.sendCategoriesPost = function(postParams) { + //$http.post($scope.PLUGIN_EDIT_URL + Math.random() + '.json', + postParams = angular.fromJson(angular.toJson(postParams)); // hashに$$hashKeyがつくのでこれで除去してる +console.log(postParams); + $http.post('/links/link_category/update_all/' + + $scope.frameId + '/' + Math.random() + '.json', + //$.param(postParams)) + //{data: postParams}) + //postParams) + $.param(postParams), + {headers: {'Content-Type': 'application/x-www-form-urlencoded'}}) + .success(function(data) { + $scope.flash.success(data.name); + $modalInstance.close(); // }) .error(function(data, status) { $scope.flash.danger(status + ' ' + data.name); @@ -242,6 +354,29 @@ NetCommonsApp.controller('Links.edit', }); }; + var move = function (origin, destination) { + var temp = $scope.editCategories.data.LinkCategories[destination]; + $scope.editCategories.data.LinkCategories[destination] = $scope.editCategories.data.LinkCategories[origin]; + $scope.editCategories.data.LinkCategories[origin] = temp; + // weight入れ換え + var tempWeight = $scope.editCategories.data.LinkCategories[destination].LinkCategoryOrder.weight; + $scope.editCategories.data.LinkCategories[destination].LinkCategoryOrder.weight = $scope.editCategories.data.LinkCategories[origin].LinkCategoryOrder.weight; + $scope.editCategories.data.LinkCategories[origin].LinkCategoryOrder.weight = tempWeight; + + }; + + $scope.moveUp = function(index){ + move(index, index - 1); + }; + + $scope.moveDown = function(index){ + move(index, index + 1); + }; + } + + + + ); From 4e5ba1ec39034ac3a5506ecd3d0c5a54b7449235 Mon Sep 17 00:00:00 2001 From: RyujiAMANO Date: Thu, 6 Nov 2014 19:28:06 +0900 Subject: [PATCH 45/53] =?UTF-8?q?=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88?= =?UTF-8?q?=E3=81=9A=E3=83=AA=E3=83=B3=E3=82=AF=E8=BF=BD=E5=8A=A0=E3=81=BE?= =?UTF-8?q?=E3=81=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/LinkCategoryController.php | 37 ++++ Controller/LinksController.php | 28 +++ Model/Link.php | 35 ++++ Model/LinkCategory.php | 3 +- Model/LinkOrder.php | 34 ++++ Test/Case/Model/LinkOrderTest.php | 42 ++++- Test/Fixture/LinkOrderFixture.php | 6 +- .../content_edit_btn_category.ctp | 2 +- View/Elements/Links/index_add_link.ctp | 19 +- View/LinkCategory/delete_form.ctp | 24 +++ View/LinkCategory/view.ctp | 4 +- View/Links/json/add_form.ctp | 23 +++ webroot/js/links.js | 173 +++++++++++++++++- 13 files changed, 409 insertions(+), 21 deletions(-) create mode 100644 View/LinkCategory/delete_form.ctp create mode 100644 View/Links/json/add_form.ctp diff --git a/Controller/LinkCategoryController.php b/Controller/LinkCategoryController.php index 8d5c5c2..a2d4c90 100644 --- a/Controller/LinkCategoryController.php +++ b/Controller/LinkCategoryController.php @@ -159,6 +159,43 @@ public function update_all($frameId = 0) { } else { throw new ForbiddenException(__d('net_commons', 'Failed to register data.')); } + } + + public function delete_form($frameId = 0) { + return $this->render('LinkCategory/delete_form', false); + } + + public function delete($frameId = 0) { + if (! $this->request->isPost()) { + throw new MethodNotAllowedException(); + } + // MyTodo frameIdとLinkCategory.idの関連付けが正当なら削除OK + $id = $this->data['LinkCategory']['id']; + //保存 + if ($this->LinkCategory->delete($id)) { + // MyTodo 同一リンクの別バリエーションデータが存在しなければorderも削除。 + $result = array( + 'name' => __d('net_commons', 'Successfully finished.'), +// 'link_category' => $postData, + ); + + $this->set(compact('result')); + $this->set('_serialize', 'result'); + return $this->render(false); + } else { + throw new ForbiddenException(__d('net_commons', 'Failed to register data.')); + } + } + + public function get_categories($frameId = 0) { + // カテゴリ取得 + $linkCategories = $this->LinkCategory->getCategories( + $this->viewVars['blockId'] // MyTodo まだブロックレコードがないときは0なので、どうする？ + ); + + $this->set('linkCategories', $linkCategories); + $this->set('_serialize', array('linkCategories')); + return $this->render(false); } } diff --git a/Controller/LinksController.php b/Controller/LinksController.php index 2e6a5eb..742604e 100644 --- a/Controller/LinksController.php +++ b/Controller/LinksController.php @@ -131,4 +131,32 @@ public function manage($frameId = 0) { return $this->render('Links/manage', false); } + + public function add_form($frameId = 0) { + + } + + public function add($frameId) { + if (! $this->request->isPost()) { + throw new MethodNotAllowedException(); + } + + $postData = $this->data; + + //保存 + if ($this->Link->add($this->data)) { + + $result = array( + 'name' => __d('net_commons', 'Successfully finished.'), + 'link' => $postData, + ); + + $this->set(compact('result')); + $this->set('_serialize', 'result'); + return $this->render(false); + } else { + throw new ForbiddenException(__d('net_commons', 'Failed to register data.')); + } + + } } diff --git a/Model/Link.php b/Model/Link.php index b99f805..89b6ff5 100644 --- a/Model/Link.php +++ b/Model/Link.php @@ -116,5 +116,40 @@ public function getLinksByCategoryId($categoryId, $blockId, $contentEditable){ return $links; } + public function add($postData) { + //DBへの登録 + $dataSource = $this->getDataSource(); + $dataSource->begin(); + try { + // MyTodo block_id取得, key生成、 created_userセットは別途ビヘイビアつくってBeforeSaveあたりで処理すりゃええんちゃうか + //linksへ 登録 + $link['Link'] = $postData['Link']; + $link['Link']['key'] = $this->_makeKey(); //新規時はkeyを新規に発行 + $link['Link']['created_user'] = CakeSession::read('Auth.User.id'); + + + + if (! $this->save($link)) { + throw new ForbiddenException(serialize($this->validationErrors)); + } + $this->LinkOrder->addLinkOrder($link); + $dataSource->commit(); + return true; + + } catch (Exception $ex) { + CakeLog::error($ex->getTraceAsString()); + $dataSource->rollback(); + return false; + } + // orderを入れる。新規登録なのでorderも追加する + // order.weightは今そのカテゴリにある他のリンク＋1としたい + + } + + // Todo ビヘイビアにしたらええと思う + protected function _makeKey() { + $className = get_class($this); + return hash('sha256', $className . microtime()); + } } diff --git a/Model/LinkCategory.php b/Model/LinkCategory.php index 7728774..f81de85 100644 --- a/Model/LinkCategory.php +++ b/Model/LinkCategory.php @@ -149,7 +149,8 @@ public function saveLinkCategory($postData){ try { $blockId = $this->__saveBlock($frame); - //announcementsテーブル登録 + // MyTodo block_id取得, key生成、 created_userセットは別途ビヘイビアつくってBeforeSaveあたりで処理すりゃええんちゃうか + //link_categoriesへ 登録 $linkCategory['LinkCategory'] = $postData['LinkCategory']; $linkCategory['LinkCategory']['key'] = hash('sha256', 'link_category_' . microtime()); //新規時はkeyを新規に発行 $linkCategory['LinkCategory']['block_id'] = $blockId; diff --git a/Model/LinkOrder.php b/Model/LinkOrder.php index 880daea..12cb5c9 100644 --- a/Model/LinkOrder.php +++ b/Model/LinkOrder.php @@ -52,4 +52,38 @@ class LinkOrder extends LinksAppModel { ), ), ); + + public function addLinkOrder($link) { + $LinkCategory = ClassRegistry::init('Links.LinkCategory'); + $linkCategoryId = $link['Link']['link_category_id']; + $linkCategory = $LinkCategory->findById($linkCategoryId); + $linkCategoryKey = $linkCategory['LinkCategory']['key']; + + + $linkOrder['LinkOrder']['link_key'] = $link['Link']['key']; + $linkOrder['LinkOrder']['link_category_key'] = $linkCategoryKey; + + $linkOrder['LinkOrder']['weight'] = $this->_getMaxWeightByLinkCategoryKey($linkCategoryKey) + 1; + $linkOrder['LinkOrder']['created_user'] = CakeSession::read('Auth.User.id');; + + if (! $this->save($linkOrder)) { + throw new ForbiddenException(serialize($this->validationErrors)); + } + + } + protected function _getMaxWeightByLinkCategoryKey($linkCategoryKey) { + $options = array( + 'conditions' => array( + 'link_category_key' => $linkCategoryKey, + ), + 'order' => 'weight DESC' + ); + $linkOrder = $this->find('first', $options); + if(empty($linkOrder)){ + return 0; // まだ登録がない + }else{ + return $linkOrder['LinkOrder']['weight'] ; + } + } + } diff --git a/Test/Case/Model/LinkOrderTest.php b/Test/Case/Model/LinkOrderTest.php index c7b3279..9e89790 100644 --- a/Test/Case/Model/LinkOrderTest.php +++ b/Test/Case/Model/LinkOrderTest.php @@ -9,6 +9,14 @@ App::uses('LinkOrder', 'Links.Model'); + +class LinkOrderTesting extends LinkOrder{ + public $useTable = 'link_orders'; + public $alias = 'LinkOrder'; + public function _getMaxWeightByLinkCategoryKey($linkCategoryKey) { + return parent::_getMaxWeightByLinkCategoryKey($linkCategoryKey); + } +} /** * Summary for LinkOrder Test Case */ @@ -20,7 +28,11 @@ class LinkOrderTest extends CakeTestCase { * @var array */ public $fixtures = array( - 'plugin.links.link_order' + 'plugin.links.link_order', + 'plugin.links.link_category', + 'plugin.links.link_category_order', + 'plugin.links.link', + 'plugin.links.block', ); /** @@ -31,6 +43,7 @@ class LinkOrderTest extends CakeTestCase { public function setUp() { parent::setUp(); $this->LinkOrder = ClassRegistry::init('Links.LinkOrder'); + $this->LinkOrderTesting = ClassRegistry::init('Links.LinkOrderTesting'); } /** @@ -44,4 +57,31 @@ public function tearDown() { parent::tearDown(); } + public function testGetMaxWeight() { + $key = 'ckey1'; + $max = $this->LinkOrderTesting->_getMaxWeightByLinkCategoryKey($key); + $this->assertEqual($max, 10); + + $max = $this->LinkOrderTesting->_getMaxWeightByLinkCategoryKey('noDataKey'); + $this->assertEqual($max, 0); + } + + public function testAddLinkOrder() { +// $link = array( +// 'Link' => array( +// 'description' => "desc", +// 'link_category_id' => 2, +// 'status' => 1, +// 'title' => 'title', +// 'url' => 'url' +// ) +// ); + $link = array( + 'Link' => array('key' => 'key01', 'link_category_id' => 1) + ); + $this->LinkOrder->addLinkOrder($link); + + + } + } diff --git a/Test/Fixture/LinkOrderFixture.php b/Test/Fixture/LinkOrderFixture.php index bc9d06d..4f8c5b1 100644 --- a/Test/Fixture/LinkOrderFixture.php +++ b/Test/Fixture/LinkOrderFixture.php @@ -41,7 +41,7 @@ class LinkOrderFixture extends CakeTestFixture { array( 'id' => 1, 'link_key' => 'key1', - 'link_category_key' => 'Lorem ipsum dolor sit amet', + 'link_category_key' => 'ckey1', 'weight' => 10, 'created_user' => 1, 'created' => '2014-10-25 04:56:40', @@ -51,7 +51,7 @@ class LinkOrderFixture extends CakeTestFixture { array( 'id' => 2, 'link_key' => 'key2', - 'link_category_key' => 'Lorem ipsum dolor sit amet', + 'link_category_key' => 'ckey2', 'weight' => 1, 'created_user' => 1, 'created' => '2014-10-25 04:56:40', @@ -61,7 +61,7 @@ class LinkOrderFixture extends CakeTestFixture { array( 'id' => 3, 'link_key' => 'key3', - 'link_category_key' => 'Lorem ipsum dolor sit amet', + 'link_category_key' => 'ckey3', 'weight' => 5, 'created_user' => 1, 'created' => '2014-10-25 04:56:40', diff --git a/View/Elements/LinkCategory/content_edit_btn_category.ctp b/View/Elements/LinkCategory/content_edit_btn_category.ctp index ce52aa4..dd6d568 100644 --- a/View/Elements/LinkCategory/content_edit_btn_category.ctp +++ b/View/Elements/LinkCategory/content_edit_btn_category.ctp @@ -6,7 +6,7 @@
        diff --git a/View/Elements/Links/index_add_link.ctp b/View/Elements/Links/index_add_link.ctp index 3155427..e00594e 100644 --- a/View/Elements/Links/index_add_link.ctp +++ b/View/Elements/Links/index_add_link.ctp @@ -9,7 +9,7 @@ 'label' => false, 'type' => 'text', 'class' => 'form-control', - 'value' => '{{Form.link_url}}' + 'ng-model' => 'newLink.Link.url' ) ); ?> @@ -29,9 +29,12 @@ echo $this->Form->input('category', array( 'label' => false, 'type' => 'select', - 'options' => array(1 => 'カテゴリー1', '2' => 'カテゴリー2', '3' => 'カテゴリー3'), +// 'options' => array(1 => 'カテゴリー1', '2' => 'カテゴリー2', '3' => 'カテゴリー3'), 'selected' => 1, 'class' => 'form-control', + 'ng-model' => 'newLink.Link.link_category_id', + 'ng-options' => 'category.LinkCategory.id as category.LinkCategory.name for category in linkCategories', +// 'value' => '{{selectedCategory.Link.id}}', ) ); ?> @@ -46,7 +49,7 @@ 'label' => false, 'type' => 'text', 'class' => 'form-control', - 'value' => '{{Form.title}}' + 'ng-model' => 'newLink.Link.title' ) ); ?> @@ -63,7 +66,7 @@ 'type' => 'textarea', 'rows' => 2, 'class' => 'form-control', - 'value' => '{{Form.description}}' + 'ng-model' => 'newLink.Link.description' ) ); ?> @@ -73,13 +76,15 @@

        - - -

        diff --git a/View/LinkCategory/delete_form.ctp b/View/LinkCategory/delete_form.ctp new file mode 100644 index 0000000..ee103f0 --- /dev/null +++ b/View/LinkCategory/delete_form.ctp @@ -0,0 +1,24 @@ +Form->create(null); + +echo $this->Form->input('LinkCategory.id', array( + 'type' => 'text', + ) +); + + +echo $this->Form->input('Frame.frame_id', array( + 'type' => 'hidden', + 'value' => (int)$frameId, + 'ng-model' => 'edit.data.Frame.frame_id' + ) +); + + +echo $this->Form->end(); diff --git a/View/LinkCategory/view.ctp b/View/LinkCategory/view.ctp index c3ce90e..b2b274e 100644 --- a/View/LinkCategory/view.ctp +++ b/View/LinkCategory/view.ctp @@ -46,10 +46,9 @@
        +
        Form->input('category_name.0', array( echo $this->Form->input('LinkCategory.name', array( 'label' => false, 'type' => 'text', @@ -61,6 +60,7 @@ ?>
        +
        diff --git a/View/Elements/content_move_btn.ctp b/View/Elements/content_move_btn.ctp index 481ab2c..7252a8f 100644 --- a/View/Elements/content_move_btn.ctp +++ b/View/Elements/content_move_btn.ctp @@ -1,15 +1,15 @@
        - - diff --git a/View/LinkEdit/view.ctp b/View/LinkEdit/view.ctp index 9ce4e1f..74871ed 100644 --- a/View/LinkEdit/view.ctp +++ b/View/LinkEdit/view.ctp @@ -1,73 +1,55 @@ -
        -
        - カテゴリ１ -
        -
        -
        - + +
        + +
        + {{linkCategory.LinkCategory.name}} +
        + +
        +
        + - - element('content_move_btn', array('size' => '12 col-md-1', 'upDisabled' => true)); ?> - -
        -
        - - - -
        -
        - + ?> + + element('content_move_btn', array('size' => '12 col-md-1', 'upDisabled' => true, 'moveParams' => array('categoryIndex', 'linkIndex'))); ?> + +
        +
        + + {{link.Link.title}} + + + + 申請中 + 下書き + 差し戻し +
        +         +
        +
        + {{link.Link.description}} +
        -
        + element('LinkEdit/content_edit_btn_link', array( + 'published' => false, + 'size' => 12, + 'url' => $url, + 'title' => $title, + 'description' => $description)); ?> - element('LinkEdit/content_edit_btn_link', array( - 'published' => false, - 'size' => 12, - 'url' => $url, - 'title' => $title, - 'description' => $description)); ?> - -
        -
        - -
        - -
        - - - element('content_move_btn', array('size' => '12 col-md-1')); ?> - -
        -
        - - - -
        -
        - -
        - - element('LinkEdit/content_edit_btn_link', array( - 'published' => false, - 'size' => 12, - 'url' => $url, - 'title' => $title, - 'description' => $description)); ?> -
        -
        +
        + +
        カテゴリ２ diff --git a/View/Links/delete_form.ctp b/View/Links/delete_form.ctp new file mode 100644 index 0000000..b5dd872 --- /dev/null +++ b/View/Links/delete_form.ctp @@ -0,0 +1,14 @@ +Form->create(null); + +echo $this->Form->input('Link.id', array('type' => 'hidden', 'value' => $linkId)); + +echo $this->Form->input('Frame.frame_id', array( + 'type' => 'hidden', + 'value' => (int)$frameId, + ) +); + + +echo $this->Form->end(); \ No newline at end of file diff --git a/View/Links/update_weight_form.ctp b/View/Links/update_weight_form.ctp new file mode 100644 index 0000000..0bdf906 --- /dev/null +++ b/View/Links/update_weight_form.ctp @@ -0,0 +1,24 @@ +Form->create(null); + +$fields = array( + 'Link.url', + 'Link.title', + 'Link.description', + 'Link.link_category_id', + 'Link.status' +); +foreach($fields as $field){ + echo $this->Form->input($field, array('type' => 'text')); +} + +echo $this->Form->input('Frame.frame_id', array( + 'type' => 'hidden', + 'value' => (int)$frameId, + ) +); + + +echo $this->Form->end(); \ No newline at end of file diff --git a/webroot/js/links.js b/webroot/js/links.js index 710afb7..5f606ba 100644 --- a/webroot/js/links.js +++ b/webroot/js/links.js @@ -4,6 +4,27 @@ * * */ +//NetCommonsApp.filter('Links_statusView', function() { +// +// return function(status) { +// status = Number(status); +// switch(status){ +// case 1: // 公開 +// return ''; +// break; +// case 2: // 申請 +// return '申請中'; +// break; +// case 3: // 下書き +// return '下書き'; +// break; +// case 4: // 差し戻し +// return '差し戻し'; +// break; +// } +// } +//}); + NetCommonsApp.factory('Links_ajaxPostService', ['$http','$q', function($http, $q){ // ここのスコープは１度しか実行されない // var success = function (){ @@ -20,7 +41,7 @@ NetCommonsApp.factory('Links_ajaxPostService', ['$http','$q', function($http, $q // jsonで返さないんだから、.jsonつけなきゃいい？ $http.get(formUrl + // '/' + Math.random() + '.json') - '/' + Math.random() + '.json') + '/' + Math.random() )//今はjson形式でないので.jsonつけるのやめた .success(function(data) { //フォームエレメント生成 var form = $('
        ').html(data); @@ -240,10 +261,118 @@ console.log(data); }); +NetCommonsApp.controller('Links.links.edit', + function($scope, $http, $sce, $timeout, dialogs, Links_ajaxPostService) { + $scope.linkCategories = []; + + $scope.init = function(){ + // リンクリストを取得して$scope.linkCategoriesにセットする + $http.get('/links/links/all/' + + $scope.frameId + '/' + Math.random() + '.json') + .success(function(data) { + $scope.linkCategories = data; + }) + .error(function(data, status) { + //取得に失敗 MyTodoエラーメッセージ + $scope.flash.danger(status + ' ' + data.name); + $scope.sending = false; + }); + + } + + $scope.deleteButton = function(linkId) { + dlg = dialogs.confirm('Confirmation','リンクを削除してもよろしいですか？'); + dlg.result.then( + function(btn){ + // Yes + $scope.sendDelete(linkId); + }, + function(btn){} // NO + ); + }; + + $scope.sendDelete = function(linkId){ + var sendData = { + Link:{ + id: linkId + }, + Frame:{ + frame_id: $scope.frameId + } + }; + Links_ajaxPostService.send( + sendData, + '/links/links/delete_form/' + $scope.frameId + '/' +linkId, + '/links/links/delete/' + $scope.frameId + ) + .success(function(data){ + console.log(data); + $scope.flash.success(data.name); + $modalInstance.close(); + }) + .error(function(data, status) { + //keyの取得に失敗 + console.log(data); + $scope.flash.danger(status + ' ' + data.name); + $scope.sending = false; + }); + + } + + $scope.send = function(){ + Links_ajaxPostService.send( + $scope.linkCategories, + '/links/links/update_weight_form/' + $scope.frameId + '/' + Math.random(), + '/links/links/update_weight/' + $scope.frameId + '/' + Math.random() + '.json' + ) + .success(function(data){ + console.log(data); + $scope.flash.success(data.name); + $modalInstance.close(); + }) + .error(function(data, status) { + //keyの取得に失敗 + console.log(data); + $scope.flash.danger(status + ' ' + data.name); + $scope.sending = false; + }); + + } + + var move = function (categoryIndex, origin, destination) { + console.log($scope.linkCategories[categoryIndex]); + var temp = $scope.linkCategories[categoryIndex].links[destination]; + $scope.linkCategories[categoryIndex].links[destination] = $scope.linkCategories[categoryIndex].links[origin]; + $scope.linkCategories[categoryIndex].links[origin] = temp; + // weight入れ換え + var tempWeight = $scope.linkCategories[categoryIndex].links[destination].LinkOrder.weight; + $scope.linkCategories[categoryIndex].links[destination].LinkOrder.weight = $scope.linkCategories[categoryIndex].links[origin].LinkOrder.weight; + $scope.linkCategories[categoryIndex].links[origin].LinkOrder.weight = tempWeight; + + $scope.send(); + }; + + + $scope.moveUp = function(categoryIndex, linkIndex){ + move(categoryIndex, linkIndex, linkIndex - 1); + }; + + $scope.moveDown = function(categoryIndex, linkIndex){ + move(categoryIndex, linkIndex, linkIndex + 1); + }; + + +// $scope.closeTest = function(){ +// modal.close(); //これは効く +// } + } +) + NetCommonsApp.controller('Links.edit', function($scope, $http, $sce, $modalInstance, $timeout, dialogs, Links_ajaxPostService) { + /** * edit _method * @@ -287,7 +416,7 @@ NetCommonsApp.controller('Links.edit', // LinkCategory:[], // LinkCategoryOrder:[], Frame: { - frame_id: $scope.frameId//フレームIDが不一致かーーーーー + frame_id: $scope.frameId }, _Token: { key: '', @@ -355,20 +484,12 @@ NetCommonsApp.controller('Links.edit', $scope.Form.description = ''; }; - $scope.deleteEditLink = function() { - dlg = dialogs.confirm('Confirmation','リンクを削除してもよろしいですか？'); - dlg.result.then( - function(btn){}, // Yes - function(btn){} // NO - ); - }; $scope.deleteEditCategory = function(index) { dlg = dialogs.confirm('Confirmation','カテゴリーを削除してもよろしいですか？'); dlg.result.then( function(btn){ - console.log('Click Yes'); var postData = { LinkCategory:{ id: $scope.editCategories.data.LinkCategories[index].LinkCategory.id @@ -540,8 +661,5 @@ console.log(postParams); } - - - ); From 78c22319dda4febfd914ce7ff66c1fab79f8db5d Mon Sep 17 00:00:00 2001 From: RyujiAMANO Date: Mon, 17 Nov 2014 13:19:12 +0900 Subject: [PATCH 48/53] =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=AF=E7=B7=A8?= =?UTF-8?q?=E9=9B=86=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/LinksController.php | 30 + .../LinkEdit/content_edit_btn_link.ctp | 2 +- View/Elements/Links/index_add_link.ctp | 1 + View/LinkEdit/view.ctp | 109 +--- View/Links/edit_form.ctp | 26 + View/Links/index.ctp | 2 +- View/Links/manage.ctp | 6 +- webroot/js/links.js | 586 ++++++++++-------- 8 files changed, 404 insertions(+), 358 deletions(-) create mode 100644 View/Links/edit_form.ctp diff --git a/Controller/LinksController.php b/Controller/LinksController.php index 8b4d4e0..90b79a6 100644 --- a/Controller/LinksController.php +++ b/Controller/LinksController.php @@ -216,6 +216,36 @@ public function delete($frameId = 0) { throw new ForbiddenException(__d('net_commons', 'Failed to register data.')); } + } + public function edit_form($frameId = 0, $linkId) { + $this->set(compact('frameId', 'linkId')); + } + + public function edit($frameId, $linkId) { + if (! $this->request->isPost()) { + throw new MethodNotAllowedException(); + } + + $postData = $this->data; + + //保存 + if ($this->Link->save($this->data)) { + + $result = array( + 'name' => __d('net_commons', 'Successfully finished.'), + 'link' => $postData, + ); + + $this->set(compact('result')); + $this->set('_serialize', 'result'); + return $this->render(false); + } else { + + $error = __d('net_commons', 'Failed to register data.'); + $error .= $this->formatValidationErrors($this->Link->validationErrors); + throw new ForbiddenException($error); + } + } // MyTodo モデルに移動するか、ヘルパかコンポーネントかビヘイビアにする… diff --git a/View/Elements/LinkEdit/content_edit_btn_link.ctp b/View/Elements/LinkEdit/content_edit_btn_link.ctp index ae274e5..d2216e7 100644 --- a/View/Elements/LinkEdit/content_edit_btn_link.ctp +++ b/View/Elements/LinkEdit/content_edit_btn_link.ctp @@ -8,7 +8,7 @@ diff --git a/View/Elements/Links/index_add_link.ctp b/View/Elements/Links/index_add_link.ctp index e00594e..fb49633 100644 --- a/View/Elements/Links/index_add_link.ctp +++ b/View/Elements/Links/index_add_link.ctp @@ -1,3 +1,4 @@ +
        diff --git a/View/LinkEdit/view.ctp b/View/LinkEdit/view.ctp index 74871ed..847994c 100644 --- a/View/LinkEdit/view.ctp +++ b/View/LinkEdit/view.ctp @@ -1,4 +1,4 @@ -
        +
        @@ -49,113 +49,6 @@
        - -
        -
        - カテゴリ２ -
        -
        -
        - - - - element('content_move_btn', array('size' => '12 col-md-1')); ?> - -
        -
        - - - - 申請中 -
        -
        - -
        -
        - - element('LinkEdit/content_edit_btn_link', array( - 'published' => true, - 'size' => 12, - 'url' => $url, - 'title' => $title, - 'description' => $description)); ?> - -
        -
        - -
        - -
        - - - - element('content_move_btn', array('size' => '12 col-md-1')); ?> - -
        -
        - - - - 下書き -
        -
        - -
        -
        - - element('LinkEdit/content_edit_btn_link', array( - 'published' => false, - 'size' => 12, - 'url' => $url, - 'title' => $title, - 'description' => $description)); ?> - -
        -
        - -
        - -
        - - - - element('content_move_btn', array('size' => '12 col-md-1', 'downDisabled' => true)); ?> - -
        -
        - - - - 差し戻し -
        -
        - -
        -
        - - element('LinkEdit/content_edit_btn_link', array( - 'published' => false, - 'size' => 12, - 'url' => $url, - 'title' => $title, - 'description' => $description)); ?> - -
        - -
        -

        -

        diff --git a/View/Links/manage.ctp b/View/Links/manage.ctp index 2999a6a..649ddea 100644 --- a/View/Links/manage.ctp +++ b/View/Links/manage.ctp @@ -63,7 +63,7 @@ -