- BlockTabs->block(BlockTabsComponent::BLOCK_TAB_SETTING); ?>
+ BlockTabs->block(BlockTabsHelper::BLOCK_TAB_SETTING); ?>
element('Blocks.edit_form', array(
'model' => 'LinkBlock',
diff --git a/View/LinkBlocks/index.ctp b/View/LinkBlocks/index.ctp
index 864a173..38f7813 100644
--- a/View/LinkBlocks/index.ctp
+++ b/View/LinkBlocks/index.ctp
@@ -11,7 +11,7 @@
?>
- BlockTabs->main(BlockTabsComponent::MAIN_TAB_BLOCK_INDEX); ?>
+ BlockTabs->main(BlockTabsHelper::MAIN_TAB_BLOCK_INDEX); ?>
Date: Sat, 7 May 2016 11:58:57 +0900
Subject: [PATCH 143/274] =?UTF-8?q?plugins=E3=81=AB=E6=96=B0=E7=9D=80?=
=?UTF-8?q?=E3=80=81=E6=A4=9C=E7=B4=A2=E3=81=B8=E3=81=AE=E8=A1=A8=E7=A4=BA?=
=?UTF-8?q?=E6=9C=89=E7=84=A1=E3=81=AE=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB?=
=?UTF-8?q?=E3=83=89=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=9F=E4=BA=8B=E3=81=AB?=
=?UTF-8?q?=E3=82=88=E3=82=8B=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Config/Migration/001_plugin_records.php | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Config/Migration/001_plugin_records.php b/Config/Migration/001_plugin_records.php
index 50f2c2d..c588297 100644
--- a/Config/Migration/001_plugin_records.php
+++ b/Config/Migration/001_plugin_records.php
@@ -50,6 +50,8 @@ class PluginRecords extends NetCommonsMigration {
'type' => 1,
'default_action' => 'links/index',
'default_setting_action' => 'link_blocks/index',
+ 'display_topics' => 1,
+ 'display_search' => 1,
),
//英語
array(
@@ -60,6 +62,8 @@ class PluginRecords extends NetCommonsMigration {
'type' => 1,
'default_action' => 'links/index',
'default_setting_action' => 'link_blocks/index',
+ 'display_topics' => 1,
+ 'display_search' => 1,
),
),
'PluginsRole' => array(
From 8604f85bbf465e02bd59fac94f7d935e7716d48a Mon Sep 17 00:00:00 2001
From: Mitsuru Mutaguchi
Date: Sat, 7 May 2016 12:00:26 +0900
Subject: [PATCH 144/274] =?UTF-8?q?Mails.MailsHtml=E3=83=98=E3=83=AB?=
=?UTF-8?q?=E3=83=91=E3=83=BC=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=97=E4=B8=8D?=
=?UTF-8?q?=E8=A6=81=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Controller/LinkMailSettingsController.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/Controller/LinkMailSettingsController.php b/Controller/LinkMailSettingsController.php
index e5564dc..b0b7705 100644
--- a/Controller/LinkMailSettingsController.php
+++ b/Controller/LinkMailSettingsController.php
@@ -30,7 +30,6 @@ class LinkMailSettingsController extends MailSettingsController {
'mainTabs' => array('block_index', 'frame_settings'),
'blockTabs' => array('block_settings', 'mail_settings', 'role_permissions'),
),
- 'Mails.MailsHtml',
'Mails.MailForm',
);
From 9a70a04374cddfcd6f4c6a434ccf52bbb1cbb6d5 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Mon, 9 May 2016 18:54:12 +0900
Subject: [PATCH 145/274] =?UTF-8?q?=E6=96=B0=E7=9D=80=E3=83=87=E3=83=BC?=
=?UTF-8?q?=E3=82=BF=E3=81=AE=E7=99=BB=E9=8C=B2=E5=87=A6=E7=90=86=E8=BF=BD?=
=?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Controller/LinksController.php | 3 +++
Model/Link.php | 8 ++++++++
2 files changed, 11 insertions(+)
diff --git a/Controller/LinksController.php b/Controller/LinksController.php
index 1b4e076..f6d9208 100644
--- a/Controller/LinksController.php
+++ b/Controller/LinksController.php
@@ -133,6 +133,9 @@ public function view() {
if (! $this->Link->updateCount($link['Link']['id'])) {
return $this->throwBadRequest();
}
+
+ //新着データを既読にする
+ $this->Link->saveTopicUserStatus($link);
}
/**
diff --git a/Model/Link.php b/Model/Link.php
index 06a995e..2c2af3f 100644
--- a/Model/Link.php
+++ b/Model/Link.php
@@ -39,6 +39,14 @@ class Link extends LinksAppModel {
'X-CATEGORY_NAME' => 'Category.name',
),
),
+ 'Topics.Topics' => array(
+ 'fields' => array(
+ 'title' => 'Link.title',
+ 'summary' => 'Link.description',
+ 'path' => '/:plugin_key/:plugin_key/view/:block_id/:content_key',
+ ),
+ 'search_contents' => array('url')
+ ),
);
/**
From 7b8d897df84c68ca2635bd0550124bf78af69259 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Mon, 9 May 2016 19:30:55 +0900
Subject: [PATCH 146/274] =?UTF-8?q?=E6=96=B0=E7=9D=80=E3=83=87=E3=83=BC?=
=?UTF-8?q?=E3=82=BF=E3=81=AE=E7=99=BB=E9=8C=B2=E5=87=A6=E7=90=86=E8=BF=BD?=
=?UTF-8?q?=E5=8A=A0=E3=80=81BlockIndexHelper=E3=80=81BlockFormHelper?=
=?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=81=AB=E3=82=88=E3=82=8B=E6=94=B9?=
=?UTF-8?q?=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Controller/LinkBlocksController.php | 1 +
Controller/LinkFrameSettingsController.php | 1 +
Model/LinkBlock.php | 20 +++---
Test/Case/Model/Link/SaveLinkTest.php | 11 ++++
Test/Case/Model/Link/SaveTest.php | 11 ++++
View/LinkBlocks/edit.ctp | 18 ++----
View/LinkBlocks/index.ctp | 75 ++++++++++++----------
View/LinkFrameSettings/edit.ctp | 12 ++--
8 files changed, 83 insertions(+), 66 deletions(-)
diff --git a/Controller/LinkBlocksController.php b/Controller/LinkBlocksController.php
index 89e6e94..c9fdd23 100644
--- a/Controller/LinkBlocksController.php
+++ b/Controller/LinkBlocksController.php
@@ -58,6 +58,7 @@ class LinkBlocksController extends LinksAppController {
*/
public $helpers = array(
'Blocks.BlockForm',
+ 'Blocks.BlockIndex',
'Blocks.BlockTabs' => array(
'mainTabs' => array('block_index', 'frame_settings'),
'blockTabs' => array('block_settings', 'mail_settings', 'role_permissions'),
diff --git a/Controller/LinkFrameSettingsController.php b/Controller/LinkFrameSettingsController.php
index 66f65a6..091e543 100644
--- a/Controller/LinkFrameSettingsController.php
+++ b/Controller/LinkFrameSettingsController.php
@@ -54,6 +54,7 @@ class LinkFrameSettingsController extends LinksAppController {
* @var array
*/
public $helpers = array(
+ 'Blocks.BlockForm',
'Blocks.BlockTabs' => array(
'mainTabs' => array('block_index', 'frame_settings'),
'blockTabs' => array('block_settings', 'role_permissions'),
diff --git a/Model/LinkBlock.php b/Model/LinkBlock.php
index d1cec68..49a9a9c 100644
--- a/Model/LinkBlock.php
+++ b/Model/LinkBlock.php
@@ -184,22 +184,20 @@ public function createLinkBlock() {
* @return array LinkBlockデータ配列
*/
public function getLinkBlock() {
- $linkBlock = $this->find('all', array(
- 'recursive' => -1,
- 'fields' => array(
+ $fields = Hash::merge(
+ array(
$this->alias . '.*',
$this->Block->alias . '.*',
$this->LinkSetting->alias . '.*',
),
+ Hash::get($this->belongsTo, 'TrackableCreator.fields', array()),
+ Hash::get($this->belongsTo, 'TrackableUpdater.fields', array())
+ );
+
+ $linkBlock = $this->find('all', array(
+ 'recursive' => 0,
+ 'fields' => $fields,
'joins' => array(
- array(
- 'table' => $this->Block->table,
- 'alias' => $this->Block->alias,
- 'type' => 'INNER',
- 'conditions' => array(
- $this->alias . '.id' . ' = ' . $this->Block->alias . ' .id',
- ),
- ),
array(
'table' => $this->LinkSetting->table,
'alias' => $this->LinkSetting->alias,
diff --git a/Test/Case/Model/Link/SaveLinkTest.php b/Test/Case/Model/Link/SaveLinkTest.php
index 4b2b49c..53ab77f 100644
--- a/Test/Case/Model/Link/SaveLinkTest.php
+++ b/Test/Case/Model/Link/SaveLinkTest.php
@@ -56,6 +56,17 @@ class LinkSaveLinkTest extends WorkflowSaveTest {
*/
protected $_methodName = 'saveLink';
+/**
+ * setUp method
+ *
+ * @return void
+ */
+ public function setUp() {
+ parent::setUp();
+ $model = $this->_modelName;
+ $this->$model->Behaviors->unload('Topics');
+ }
+
/**
* Save用DataProvider
*
diff --git a/Test/Case/Model/Link/SaveTest.php b/Test/Case/Model/Link/SaveTest.php
index ad670f2..970623d 100644
--- a/Test/Case/Model/Link/SaveTest.php
+++ b/Test/Case/Model/Link/SaveTest.php
@@ -57,6 +57,17 @@ class LinkSaveTest extends NetCommonsModelTestCase {
*/
protected $_methodName = 'save';
+/**
+ * setUp method
+ *
+ * @return void
+ */
+ public function setUp() {
+ parent::setUp();
+ $model = $this->_modelName;
+ $this->$model->Behaviors->unload('Topics');
+ }
+
/**
* テストDataの取得
*
diff --git a/View/LinkBlocks/edit.ctp b/View/LinkBlocks/edit.ctp
index c4b062c..b005ee0 100644
--- a/View/LinkBlocks/edit.ctp
+++ b/View/LinkBlocks/edit.ctp
@@ -16,23 +16,15 @@
BlockTabs->main(BlockTabsHelper::MAIN_TAB_BLOCK_INDEX); ?>
-
From 516dfd559fb0fa23e3106de4d52507b84b9e8698 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Wed, 11 May 2016 23:52:12 +0900
Subject: [PATCH 147/274] =?UTF-8?q?=E4=B8=80=E8=A6=A7=E8=A1=A8=E7=A4=BA?=
=?UTF-8?q?=E3=81=AE=E3=83=96=E3=83=AD=E3=83=83=E3=82=AF=E3=82=BF=E3=82=A4?=
=?UTF-8?q?=E3=83=88=E3=83=AB=E3=81=AEh1=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
View/Elements/Links/index_dropdown.ctp | 2 +-
View/Links/index.ctp | 30 +++++++++++---------------
webroot/css/style.css | 4 ++++
3 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/View/Elements/Links/index_dropdown.ctp b/View/Elements/Links/index_dropdown.ctp
index d12b7bb..ce59fd3 100644
--- a/View/Elements/Links/index_dropdown.ctp
+++ b/View/Elements/Links/index_dropdown.ctp
@@ -10,7 +10,7 @@
*/
?>
-
diff --git a/View/LinkFrameSettings/edit.ctp b/View/LinkFrameSettings/edit.ctp
index 4e0aa57..62624fb 100644
--- a/View/LinkFrameSettings/edit.ctp
+++ b/View/LinkFrameSettings/edit.ctp
@@ -29,7 +29,7 @@ $linkFrameSetting = NetCommonsAppController::camelizeKeyRecursive(
'currentListStyle' => $listStyles[Hash::get($this->data, 'LinkFrameSetting.list_style', '')],
))); ?>)">
- BlockTabs->main(BlockTabsComponent::MAIN_TAB_FRAME_SETTING); ?>
+ BlockTabs->main(BlockTabsHelper::MAIN_TAB_FRAME_SETTING); ?>
Date: Sat, 2 Apr 2016 17:51:03 +0900
Subject: [PATCH 136/274] =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=83=AB=E3=81=AEUni?=
=?UTF-8?q?t=E3=83=86=E3=82=B9=E3=83=88=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../LinkMailSettingsController/EditTest.php | 93 +++++++++++++++++++
1 file changed, 93 insertions(+)
create mode 100644 Test/Case/Controller/LinkMailSettingsController/EditTest.php
diff --git a/Test/Case/Controller/LinkMailSettingsController/EditTest.php b/Test/Case/Controller/LinkMailSettingsController/EditTest.php
new file mode 100644
index 0000000..624f5a2
--- /dev/null
+++ b/Test/Case/Controller/LinkMailSettingsController/EditTest.php
@@ -0,0 +1,93 @@
+
+ * @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('NetCommonsControllerTestCase', 'NetCommons.TestSuite');
+
+/**
+ * LinkMailSettingsController::edit()のテスト
+ *
+ * @author Shohei Nakajima
+ * @package NetCommons\Links\Test\Case\Controller\LinkMailSettingsController
+ */
+class LinkMailSettingsControllerEditTest extends NetCommonsControllerTestCase {
+
+/**
+ * Fixtures
+ *
+ * @var array
+ */
+ public $fixtures = array(
+ 'plugin.categories.category',
+ 'plugin.categories.category_order',
+ 'plugin.links.link',
+ 'plugin.links.link_frame_setting',
+ 'plugin.links.link_order',
+ 'plugin.links.link_setting',
+ 'plugin.workflow.workflow_comment',
+ );
+
+/**
+ * Plugin name
+ *
+ * @var string
+ */
+ public $plugin = 'links';
+
+/**
+ * Controller name
+ *
+ * @var string
+ */
+ protected $_controller = 'link_mail_settings';
+
+/**
+ * setUp method
+ *
+ * @return void
+ */
+ public function setUp() {
+ parent::setUp();
+
+ //ログイン
+ TestAuthGeneral::login($this);
+ }
+
+/**
+ * tearDown method
+ *
+ * @return void
+ */
+ public function tearDown() {
+ //ログアウト
+ TestAuthGeneral::logout($this);
+
+ parent::tearDown();
+ }
+
+/**
+ * edit()アクションのGetリクエストテスト
+ *
+ * @return void
+ */
+ public function testEditGet() {
+ //テストデータ
+ $frameId = '6';
+ $blockId = '2';
+
+ //テスト実行
+ $this->_testGetAction(array('action' => 'edit', 'block_id' => $blockId, 'frame_id' => $frameId),
+ array('method' => 'assertNotEmpty'), null, 'view');
+
+ //チェック
+ $this->assertInput('form', null, 'links/link_mail_settings/edit/' . $blockId, $this->view);
+ }
+
+}
From 8656200f712ac4ca19d6b61a093313258f138737 Mon Sep 17 00:00:00 2001
From: Mitsuru Mutaguchi
Date: Thu, 14 Apr 2016 05:45:31 +0900
Subject: [PATCH 137/274] =?UTF-8?q?MailSetting=E3=83=86=E3=83=BC=E3=83=96?=
=?UTF-8?q?=E3=83=AB=E3=81=AE=E5=AE=9A=E5=9E=8B=E6=96=87=E3=81=A0=E3=81=91?=
=?UTF-8?q?=E5=88=A5=E3=83=86=E3=83=BC=E3=83=96=E3=83=AB=E3=81=AB=E5=88=87?=
=?UTF-8?q?=E3=82=8A=E5=87=BA=E3=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Config/Migration/002_mail_setting_records.php | 55 ++++++++++++++++---
1 file changed, 48 insertions(+), 7 deletions(-)
diff --git a/Config/Migration/002_mail_setting_records.php b/Config/Migration/002_mail_setting_records.php
index d9a0632..9631157 100644
--- a/Config/Migration/002_mail_setting_records.php
+++ b/Config/Migration/002_mail_setting_records.php
@@ -17,6 +17,13 @@
*/
class LinkMailSettingRecords extends NetCommonsMigration {
+/**
+ * プラグインキー
+ *
+ * @var string
+ */
+ const PLUGIN_KEY = 'links';
+
/**
* Migration description
*
@@ -41,14 +48,21 @@ class LinkMailSettingRecords extends NetCommonsMigration {
*/
public $records = array(
'MailSetting' => array(
- //コンテンツ通知
+ //コンテンツ通知 - 設定
+ array(
+ 'plugin_key' => self::PLUGIN_KEY,
+ 'block_key' => null,
+ 'is_mail_send' => false,
+ ),
+ ),
+ 'MailSettingFixedPhrase' => array(
+ //コンテンツ通知 - 定型文
// * 英語
array(
'language_id' => '1',
- 'plugin_key' => 'links',
+ 'plugin_key' => self::PLUGIN_KEY,
'block_key' => null,
'type_key' => 'contents',
- 'is_mail_send' => false,
'mail_fixed_phrase_subject' => '', //デフォルト(__d('mails', 'MailSetting.mail_fixed_phrase_subject'))
'mail_fixed_phrase_body' => '{X-PLUGIN_NAME}にリンクが追加されたのでお知らせします。
ルーム名: {X-ROOM}
@@ -67,10 +81,9 @@ class LinkMailSettingRecords extends NetCommonsMigration {
// * 日本語
array(
'language_id' => '2',
- 'plugin_key' => 'links',
+ 'plugin_key' => self::PLUGIN_KEY,
'block_key' => null,
'type_key' => 'contents',
- 'is_mail_send' => false,
'mail_fixed_phrase_subject' => '',
'mail_fixed_phrase_body' => '{X-PLUGIN_NAME}にリンクが追加されたのでお知らせします。
ルーム名: {X-ROOM}
@@ -106,9 +119,37 @@ public function before($direction) {
* @return bool Should process continue
*/
public function after($direction) {
+ $this->loadModels(array(
+ 'MailSetting' => 'Mails.MailSetting',
+ 'MailSettingFixedPhrase' => 'Mails.MailSettingFixedPhrase',
+ ));
foreach ($this->records as $model => $records) {
- if (!$this->updateRecords($model, $records)) {
- return false;
+ if ($direction == 'up') {
+ if ($model == 'MailSettingFixedPhrase') {
+ // mail_setting_id セット
+ $data = $this->MailSetting->find('first', array(
+ 'recursive' => -1,
+ 'conditions' => array('plugin_key' => self::PLUGIN_KEY),
+ 'callbacks' => false,
+ ));
+ foreach ($records as &$record) {
+ $record['mail_setting_id'] = $data['MailSetting']['id'];
+ }
+ }
+ if (!$this->updateRecords($model, $records)) {
+ return false;
+ }
+ } elseif ($direction == 'down') {
+ $conditions = array(
+ 'plugin_key' => self::PLUGIN_KEY,
+ 'block_key' => null,
+ );
+ if (!$this->MailSettingFixedPhrase->deleteAll($conditions, false, false)) {
+ return false;
+ }
+ if (!$this->MailSetting->deleteAll($conditions, false, false)) {
+ return false;
+ }
}
}
return true;
From 31d7ec8137528d88fc2a47fa1177a096338efbca Mon Sep 17 00:00:00 2001
From: Mitsuru Mutaguchi
Date: Thu, 14 Apr 2016 06:35:34 +0900
Subject: [PATCH 138/274] =?UTF-8?q?MailSetting=E3=83=86=E3=83=BC=E3=83=96?=
=?UTF-8?q?=E3=83=AB=E3=81=AE=E5=AE=9A=E5=9E=8B=E6=96=87=E3=81=A0=E3=81=91?=
=?UTF-8?q?=E5=88=A5=E3=83=86=E3=83=BC=E3=83=96=E3=83=AB=E3=81=AB=E5=88=87?=
=?UTF-8?q?=E3=82=8A=E5=87=BA=E3=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Config/Migration/002_mail_setting_records.php | 39 ++-----------------
1 file changed, 3 insertions(+), 36 deletions(-)
diff --git a/Config/Migration/002_mail_setting_records.php b/Config/Migration/002_mail_setting_records.php
index 9631157..299746a 100644
--- a/Config/Migration/002_mail_setting_records.php
+++ b/Config/Migration/002_mail_setting_records.php
@@ -8,14 +8,14 @@
* @copyright Copyright 2014, NetCommons Project
*/
-App::uses('NetCommonsMigration', 'NetCommons.Config/Migration');
+App::uses('MailsMigration', 'Mails.Config/Migration');
/**
* メール設定データのMigration
*
* @package NetCommons\Mails\Config\Migration
*/
-class LinkMailSettingRecords extends NetCommonsMigration {
+class LinkMailSettingRecords extends MailsMigration {
/**
* プラグインキー
@@ -119,39 +119,6 @@ public function before($direction) {
* @return bool Should process continue
*/
public function after($direction) {
- $this->loadModels(array(
- 'MailSetting' => 'Mails.MailSetting',
- 'MailSettingFixedPhrase' => 'Mails.MailSettingFixedPhrase',
- ));
- foreach ($this->records as $model => $records) {
- if ($direction == 'up') {
- if ($model == 'MailSettingFixedPhrase') {
- // mail_setting_id セット
- $data = $this->MailSetting->find('first', array(
- 'recursive' => -1,
- 'conditions' => array('plugin_key' => self::PLUGIN_KEY),
- 'callbacks' => false,
- ));
- foreach ($records as &$record) {
- $record['mail_setting_id'] = $data['MailSetting']['id'];
- }
- }
- if (!$this->updateRecords($model, $records)) {
- return false;
- }
- } elseif ($direction == 'down') {
- $conditions = array(
- 'plugin_key' => self::PLUGIN_KEY,
- 'block_key' => null,
- );
- if (!$this->MailSettingFixedPhrase->deleteAll($conditions, false, false)) {
- return false;
- }
- if (!$this->MailSetting->deleteAll($conditions, false, false)) {
- return false;
- }
- }
- }
- return true;
+ return parent::updateAndDelete($direction, self::PLUGIN_KEY);
}
}
From 7d7b463f9040983b7806e2a37329bb2016ccad5f Mon Sep 17 00:00:00 2001
From: Mitsuru Mutaguchi
Date: Thu, 14 Apr 2016 06:37:34 +0900
Subject: [PATCH 139/274] =?UTF-8?q?Fixture=E8=BF=BD=E5=8A=A0=20-=20MailSet?=
=?UTF-8?q?ting=E3=83=86=E3=83=BC=E3=83=96=E3=83=AB=E3=81=AE=E5=AE=9A?=
=?UTF-8?q?=E5=9E=8B=E6=96=87=E3=81=A0=E3=81=91=E5=88=A5=E3=83=86=E3=83=BC?=
=?UTF-8?q?=E3=83=96=E3=83=AB=E3=81=AB=E5=88=87=E3=82=8A=E5=87=BA=E3=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Test/Case/Controller/LinkMailSettingsController/EditTest.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/Test/Case/Controller/LinkMailSettingsController/EditTest.php b/Test/Case/Controller/LinkMailSettingsController/EditTest.php
index 624f5a2..1348ef5 100644
--- a/Test/Case/Controller/LinkMailSettingsController/EditTest.php
+++ b/Test/Case/Controller/LinkMailSettingsController/EditTest.php
@@ -31,6 +31,7 @@ class LinkMailSettingsControllerEditTest extends NetCommonsControllerTestCase {
'plugin.links.link_frame_setting',
'plugin.links.link_order',
'plugin.links.link_setting',
+ 'plugin.mails.mail_setting_fixed_phrase',
'plugin.workflow.workflow_comment',
);
From e5823d44e6e07b11f6b38516920d66252427ade9 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Mon, 18 Apr 2016 00:28:39 +0900
Subject: [PATCH 140/274] =?UTF-8?q?1=E8=A1=8C=E3=80=81100=E6=96=87?=
=?UTF-8?q?=E5=AD=97=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/LinkOrdersController.php | 2 +-
Controller/LinksController.php | 11 ++++++++---
Model/Link.php | 10 ++++++++--
Model/LinkBlock.php | 17 ++++++++++++-----
Model/LinkFrameSetting.php | 9 ++++++---
5 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/Controller/LinkOrdersController.php b/Controller/LinkOrdersController.php
index 97b1f5d..fa71ce8 100644
--- a/Controller/LinkOrdersController.php
+++ b/Controller/LinkOrdersController.php
@@ -57,7 +57,7 @@ public function edit() {
$this->set('linkBlock', $linkBlock['LinkBlock']);
//カテゴリ
- array_unshift($this->viewVars['categories'], $this->Category->create(array('id' => 0, 'name' => '')));
+ array_unshift($this->viewVars['categories'], $this->Category->create(['id' => 0, 'name' => '']));
//リンクデータ取得
$links = $this->Link->find('all', array(
diff --git a/Controller/LinksController.php b/Controller/LinksController.php
index ca29225..1b4e076 100644
--- a/Controller/LinksController.php
+++ b/Controller/LinksController.php
@@ -144,7 +144,9 @@ public function view() {
public function get() {
$url = Hash::get($this->request->query, 'url');
if (! $url) {
- return $this->throwBadRequest(sprintf(__d('net_commons', 'Please input %s.'), __d('links', 'URL')));
+ return $this->throwBadRequest(
+ sprintf(__d('net_commons', 'Please input %s.'), __d('links', 'URL'))
+ );
}
try {
$socket = new HttpSocket(array('request' => array('redirect' => 10)));
@@ -168,9 +170,12 @@ public function get() {
if (preg_match($pattern, $body, $matches)) {
$results['title'] = mb_convert_encoding($matches[1], 'utf-8', 'auto');
}
- $pattern = '/<>\]]*name=([\'"]?)description\\1[^"\'<>\]]*content=([\'"]?)([^"\'<>\]]*)\\2[^"\'<>\]]*>/i';
+ $pattern = '<>\]]*' .
+ 'name=([\'"]?)' .
+ 'description\\1[^"\'<>\]]*' .
+ 'content=([\'"]?)([^"\'<>\]]*)\\2[^"\'<>\]]*>';
$matches = array();
- if (preg_match($pattern, $body, $matches)) {
+ if (preg_match('/' . $pattern . '/i', $body, $matches)) {
$results['description'] = mb_convert_encoding($matches[3], 'utf-8', 'auto');
}
diff --git a/Model/Link.php b/Model/Link.php
index 1eb58bd..06a995e 100644
--- a/Model/Link.php
+++ b/Model/Link.php
@@ -134,7 +134,11 @@ public function beforeValidate($options = array()) {
),
'url' => array(
'rule' => array('url'),
- 'message' => sprintf(__d('net_commons', 'Unauthorized pattern for %s. Please input the data in %s format.'), __d('links', 'URL'), __d('links', 'URL')),
+ 'message' => sprintf(
+ __d('net_commons', 'Unauthorized pattern for %s. Please input the data in %s format.'),
+ __d('links', 'URL'),
+ __d('links', 'URL')
+ ),
'allowEmpty' => false,
'required' => true,
),
@@ -152,7 +156,9 @@ public function beforeValidate($options = array()) {
if (isset($this->data['LinkOrder'])) {
$this->LinkOrder->set($this->data['LinkOrder']);
if (! $this->LinkOrder->validates()) {
- $this->validationErrors = Hash::merge($this->validationErrors, $this->LinkOrder->validationErrors);
+ $this->validationErrors = Hash::merge(
+ $this->validationErrors, $this->LinkOrder->validationErrors
+ );
return false;
}
}
diff --git a/Model/LinkBlock.php b/Model/LinkBlock.php
index fab9048..d1cec68 100644
--- a/Model/LinkBlock.php
+++ b/Model/LinkBlock.php
@@ -120,7 +120,9 @@ public function beforeValidate($options = array()) {
'name' => array(
'notBlank' => array(
'rule' => array('notBlank'),
- 'message' => sprintf(__d('net_commons', 'Please input %s.'), __d('links', 'Link list Title')),
+ 'message' => sprintf(
+ __d('net_commons', 'Please input %s.'), __d('links', 'Link list Title')
+ ),
'required' => true,
)
)
@@ -129,7 +131,9 @@ public function beforeValidate($options = array()) {
if (isset($this->data['LinkSetting'])) {
$this->LinkSetting->set($this->data['LinkSetting']);
if (! $this->LinkSetting->validates()) {
- $this->validationErrors = Hash::merge($this->validationErrors, $this->LinkSetting->validationErrors);
+ $this->validationErrors = Hash::merge(
+ $this->validationErrors, $this->LinkSetting->validationErrors
+ );
return false;
}
}
@@ -269,15 +273,18 @@ public function deleteLinkBlock($data) {
$blocks = array_keys($blocks);
try {
- if (! $this->LinkSetting->deleteAll(array($this->LinkSetting->alias . '.block_key' => $data[$this->alias]['key']), false)) {
+ $conditions = array($this->LinkSetting->alias . '.block_key' => $data[$this->alias]['key']);
+ if (! $this->LinkSetting->deleteAll($conditions, false)) {
throw new InternalErrorException(__d('net_commons', 'Internal Server Error'));
}
- if (! $this->Link->deleteAll(array($this->Link->alias . '.block_id' => $blocks), false)) {
+ $conditions = array($this->Link->alias . '.block_id' => $blocks);
+ if (! $this->Link->deleteAll($conditions, false)) {
throw new InternalErrorException(__d('net_commons', 'Internal Server Error'));
}
- if (! $this->LinkOrder->deleteAll(array($this->LinkOrder->alias . '.block_key' => $data[$this->alias]['key']), false)) {
+ $conditions = array($this->LinkOrder->alias . '.block_key' => $data[$this->alias]['key']);
+ if (! $this->LinkOrder->deleteAll($conditions, false)) {
throw new InternalErrorException(__d('net_commons', 'Internal Server Error'));
}
diff --git a/Model/LinkFrameSetting.php b/Model/LinkFrameSetting.php
index 13641fa..4695134 100644
--- a/Model/LinkFrameSetting.php
+++ b/Model/LinkFrameSetting.php
@@ -106,7 +106,8 @@ public function __construct($id = false, $table = null, $ds = null) {
$this->categorySeparators[] = array(
'key' => $file,
'name' => '',
- 'style' => 'background-image: url(' . $img . '); ' . 'border-image: url(' . $img . '); ' . 'height: ' . $info[1] . 'px;',
+ 'style' => 'background-image: url(' . $img . '); ' .
+ 'border-image: url(' . $img . '); ' . 'height: ' . $info[1] . 'px;',
);
}
unset($dir);
@@ -252,8 +253,10 @@ public function getLinkFrameSetting($created) {
//カテゴリ間の区切り線
$separatorLine = $linkFrameSetting['LinkFrameSetting']['category_separator_line'];
- $linkFrameSetting['LinkFrameSetting']['category_separator_line_css'] =
- Hash::get(Hash::extract($this->categorySeparators, '{n}[key=' . $separatorLine . ']'), '0.style');
+
+ $extract = Hash::extract($this->categorySeparators, '{n}[key=' . $separatorLine . ']');
+ $style = Hash::get($extract, '0.style');
+ $linkFrameSetting['LinkFrameSetting']['category_separator_line_css'] = $style;
//リストマーク
$listStyle = $linkFrameSetting['LinkFrameSetting']['list_style'];
From 7ee05fa0067ace2867c009677037b80fed34333b Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Fri, 29 Apr 2016 18:45:23 +0900
Subject: [PATCH 141/274] =?UTF-8?q?Travis=E3=81=AEPHP7.0=E5=AF=BE=E5=BF=9C?=
=?UTF-8?q?=E3=80=81phpdoc=E8=87=AA=E5=8B=95=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.travis.yml | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 2664aa8..c13e8b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,19 @@ php:
- 5.4
- 5.5
- 5.6
+ - 7.0
sudo: required
env:
- - NETCOMMONS_VERSION=master DB=mysql
+ matrix:
+ - NETCOMMONS_VERSION=master DB=mysql
+ global:
+ - secure: "YVNrq7TFQ8ZF29bV9cLeq9ik3Dqrsi+vxeaV1cK/7biDKB9XAUruAk/vJAWCSEBadpEey4VHVLlPxoqcf0bp1nwCD785r7zCh0fntgSP8F8DcH6dqWBDNyRyJ2i6nkE90TpL4iGvmaY1z15u5G8DgXqW+qAneAH586vtEFZXrTA="
+ - GIT_COMMITTER_NAME=s-nakajima
+ - GIT_COMMITTER_EMAIL=nakajimashouhei@gmail.com
+ - GIT_AUTHOR_NAME=s-nakajima
+ - GIT_AUTHOR_EMAIL=nakajimashouhei@gmail.com
before_script:
- export NETCOMMONS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/NetCommons3
From d0582c7f221bf43453e3efb4631f9efdd2c82635 Mon Sep 17 00:00:00 2001
From: Mitsuru Mutaguchi
Date: Fri, 6 May 2016 17:34:03 +0900
Subject: [PATCH 142/274] =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=83=AB=E8=A8=AD?=
=?UTF-8?q?=E5=AE=9A=E5=A4=9A=E6=AE=B5=E8=A6=8B=E7=9B=B4=E3=81=97=20https:?=
=?UTF-8?q?//github.com/NetCommons3/Mails/issues/79?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Controller/LinkMailSettingsController.php | 2 ++
View/LinkMailSettings/edit.ctp | 13 +++++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Controller/LinkMailSettingsController.php b/Controller/LinkMailSettingsController.php
index 93f0e0c..e5564dc 100644
--- a/Controller/LinkMailSettingsController.php
+++ b/Controller/LinkMailSettingsController.php
@@ -30,6 +30,8 @@ class LinkMailSettingsController extends MailSettingsController {
'mainTabs' => array('block_index', 'frame_settings'),
'blockTabs' => array('block_settings', 'mail_settings', 'role_permissions'),
),
+ 'Mails.MailsHtml',
+ 'Mails.MailForm',
);
}
diff --git a/View/LinkMailSettings/edit.ctp b/View/LinkMailSettings/edit.ctp
index e3eb715..8fc2b35 100644
--- a/View/LinkMailSettings/edit.ctp
+++ b/View/LinkMailSettings/edit.ctp
@@ -17,9 +17,14 @@
From 37666f4f02d2f06cacd8729478176d36c243b3e4 Mon Sep 17 00:00:00 2001
From: s-nakajima
element('Blocks.edit_form', array(
From 908343914e0db872a070fe93821458b96d08b2d8 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Mon, 21 Mar 2016 17:35:39 +0900
Subject: [PATCH 133/274] =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=83=AB=E8=A8=AD?=
=?UTF-8?q?=E5=AE=9A=E3=81=AE=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Config/Migration/002_mail_setting_records.php | 102 ++++++++++++++++++
.../LinkBlockRolePermissionsController.php | 2 +-
Controller/LinkBlocksController.php | 2 +-
Controller/LinkMailSettingsController.php | 35 ++++++
View/LinkMailSettings/edit.ctp | 25 +++++
5 files changed, 164 insertions(+), 2 deletions(-)
create mode 100644 Config/Migration/002_mail_setting_records.php
create mode 100644 Controller/LinkMailSettingsController.php
create mode 100644 View/LinkMailSettings/edit.ctp
diff --git a/Config/Migration/002_mail_setting_records.php b/Config/Migration/002_mail_setting_records.php
new file mode 100644
index 0000000..d24fda7
--- /dev/null
+++ b/Config/Migration/002_mail_setting_records.php
@@ -0,0 +1,102 @@
+
+ * @link http://www.netcommons.org NetCommons Project
+ * @license http://www.netcommons.org/license.txt NetCommons License
+ * @copyright Copyright 2014, NetCommons Project
+ */
+
+App::uses('NetCommonsMigration', 'NetCommons.Config/Migration');
+
+/**
+ * メール設定データのMigration
+ *
+ * @package NetCommons\Mails\Config\Migration
+ */
+class LinkMailSettingRecords extends NetCommonsMigration {
+
+/**
+ * Migration description
+ *
+ * @var string
+ */
+ public $description = 'mail_setting_records';
+
+/**
+ * Actions to be performed
+ *
+ * @var array $migration
+ */
+ public $migration = array(
+ 'up' => array(),
+ 'down' => array(),
+ );
+
+/**
+ * plugin data
+ *
+ * @var array $migration
+ */
+ public $records = array(
+ 'MailSetting' => array(
+ //コンテンツ通知
+ // * 英語
+ array(
+ 'language_id' => '1',
+ 'plugin_key' => 'links',
+ 'block_key' => null,
+ 'type_key' => 'contents',
+ 'is_mail_send' => false,
+ 'mail_fixed_phrase_subject' => '', //デフォルト(__d('mails', 'MailSetting.mail_fixed_phrase_subject'))
+ 'mail_fixed_phrase_body' => '', //デフォルト(__d('mails', 'MailSetting.mail_fixed_phrase_body'))
+ ),
+ // * 日本語
+ array(
+ 'language_id' => '2',
+ 'plugin_key' => 'links',
+ 'block_key' => null,
+ 'type_key' => 'contents',
+ 'is_mail_send' => false,
+ 'mail_fixed_phrase_subject' => '',
+ 'mail_fixed_phrase_body' => '{X-PLUGIN_NAME}にコンテンツが登録されたのでお知らせします。
+ルーム名:{X-ROOM}
+ブロック名:{X-BLOCK_NAME}
+タイトル:{X-SUBJECT}
+登録者:{X-USER}
+登録日時:{X-TO_DATE}
+
+{X-BODY}
+
+この登録内容を確認するには下記のリンクをクリックして下さい。
+{X-URL}',
+ ),
+ ),
+ );
+
+/**
+ * Before migration callback
+ *
+ * @param string $direction Direction of migration process (up or down)
+ * @return bool Should process continue
+ */
+ public function before($direction) {
+ return true;
+ }
+
+/**
+ * After migration callback
+ *
+ * @param string $direction Direction of migration process (up or down)
+ * @return bool Should process continue
+ */
+ public function after($direction) {
+ foreach ($this->records as $model => $records) {
+ if (!$this->updateRecords($model, $records)) {
+ return false;
+ }
+ }
+ return true;
+ }
+}
diff --git a/Controller/LinkBlockRolePermissionsController.php b/Controller/LinkBlockRolePermissionsController.php
index be5b233..701b428 100644
--- a/Controller/LinkBlockRolePermissionsController.php
+++ b/Controller/LinkBlockRolePermissionsController.php
@@ -58,7 +58,7 @@ class LinkBlockRolePermissionsController extends LinksAppController {
'Blocks.BlockRolePermissionForm',
'Blocks.BlockTabs' => array(
'mainTabs' => array('block_index', 'frame_settings'),
- 'blockTabs' => array('block_settings', 'role_permissions'),
+ 'blockTabs' => array('block_settings', 'mail_settings', 'role_permissions'),
),
);
diff --git a/Controller/LinkBlocksController.php b/Controller/LinkBlocksController.php
index 4bca1ac..89e6e94 100644
--- a/Controller/LinkBlocksController.php
+++ b/Controller/LinkBlocksController.php
@@ -60,7 +60,7 @@ class LinkBlocksController extends LinksAppController {
'Blocks.BlockForm',
'Blocks.BlockTabs' => array(
'mainTabs' => array('block_index', 'frame_settings'),
- 'blockTabs' => array('block_settings', 'role_permissions'),
+ 'blockTabs' => array('block_settings', 'mail_settings', 'role_permissions'),
),
);
diff --git a/Controller/LinkMailSettingsController.php b/Controller/LinkMailSettingsController.php
new file mode 100644
index 0000000..93f0e0c
--- /dev/null
+++ b/Controller/LinkMailSettingsController.php
@@ -0,0 +1,35 @@
+
+ * @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('MailSettingsController', 'Mails.Controller');
+
+/**
+ * メール設定Controller
+ *
+ * @author Shohei Nakajima
+ * @package NetCommons\Links\Controller
+ */
+class LinkMailSettingsController extends MailSettingsController {
+
+/**
+ * use helpers
+ *
+ * @var array
+ */
+ public $helpers = array(
+ 'Blocks.BlockRolePermissionForm',
+ 'Blocks.BlockTabs' => array(
+ 'mainTabs' => array('block_index', 'frame_settings'),
+ 'blockTabs' => array('block_settings', 'mail_settings', 'role_permissions'),
+ ),
+ );
+
+}
diff --git a/View/LinkMailSettings/edit.ctp b/View/LinkMailSettings/edit.ctp
new file mode 100644
index 0000000..d311735
--- /dev/null
+++ b/View/LinkMailSettings/edit.ctp
@@ -0,0 +1,25 @@
+
+ * @author Shohei Nakajima
+ * @author Mitsuru Mutaguchi
+ * @link http://www.netcommons.org NetCommons Project
+ * @license http://www.netcommons.org/license.txt NetCommons License
+ * @copyright Copyright 2014, NetCommons Project
+ */
+?>
+
+
Date: Mon, 21 Mar 2016 17:47:51 +0900
Subject: [PATCH 134/274] =?UTF-8?q?=E5=88=9D=E6=9C=9F=E5=80=A4=E5=89=8A?=
=?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Config/Migration/002_mail_setting_records.php | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/Config/Migration/002_mail_setting_records.php b/Config/Migration/002_mail_setting_records.php
index d24fda7..cca5cc1 100644
--- a/Config/Migration/002_mail_setting_records.php
+++ b/Config/Migration/002_mail_setting_records.php
@@ -60,17 +60,7 @@ class LinkMailSettingRecords extends NetCommonsMigration {
'type_key' => 'contents',
'is_mail_send' => false,
'mail_fixed_phrase_subject' => '',
- 'mail_fixed_phrase_body' => '{X-PLUGIN_NAME}にコンテンツが登録されたのでお知らせします。
-ルーム名:{X-ROOM}
-ブロック名:{X-BLOCK_NAME}
-タイトル:{X-SUBJECT}
-登録者:{X-USER}
-登録日時:{X-TO_DATE}
-
-{X-BODY}
-
-この登録内容を確認するには下記のリンクをクリックして下さい。
-{X-URL}',
+ 'mail_fixed_phrase_body' => '',
),
),
);
From 71e09485c722310988d60ee378ae503e900dd107 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Wed, 23 Mar 2016 15:20:22 +0900
Subject: [PATCH 135/274] =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=83=AB=E9=80=9A?=
=?UTF-8?q?=E7=9F=A5=E6=A9=9F=E8=83=BD=E3=82=92=E7=B5=84=E3=81=BF=E8=BE=BC?=
=?UTF-8?q?=E3=81=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Config/Migration/002_mail_setting_records.php | 28 +++++++++++++++++--
Controller/LinksController.php | 6 ++--
Locale/jpn/LC_MESSAGES/links.po | 4 +++
Model/Link.php | 22 +++++++++++++++
View/LinkMailSettings/edit.ctp | 2 +-
5 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/Config/Migration/002_mail_setting_records.php b/Config/Migration/002_mail_setting_records.php
index cca5cc1..d9a0632 100644
--- a/Config/Migration/002_mail_setting_records.php
+++ b/Config/Migration/002_mail_setting_records.php
@@ -50,7 +50,19 @@ class LinkMailSettingRecords extends NetCommonsMigration {
'type_key' => 'contents',
'is_mail_send' => false,
'mail_fixed_phrase_subject' => '', //デフォルト(__d('mails', 'MailSetting.mail_fixed_phrase_subject'))
- 'mail_fixed_phrase_body' => '', //デフォルト(__d('mails', 'MailSetting.mail_fixed_phrase_body'))
+ 'mail_fixed_phrase_body' => '{X-PLUGIN_NAME}にリンクが追加されたのでお知らせします。
+ルーム名: {X-ROOM}
+リンクリスト名: {X-BLOCK_NAME}
+リンク先: {X-LINK_URL}
+タイトル: {X-TITLE}
+カテゴリ: {X-CATEGORY_NAME}
+登録者: {X-USER}
+登録日時: {X-TO_DATE}
+説明:
+{X-DESCRIPTION}
+
+このリンクを確認するには、下記アドレスへ
+{X-URL}',
),
// * 日本語
array(
@@ -60,7 +72,19 @@ class LinkMailSettingRecords extends NetCommonsMigration {
'type_key' => 'contents',
'is_mail_send' => false,
'mail_fixed_phrase_subject' => '',
- 'mail_fixed_phrase_body' => '',
+ 'mail_fixed_phrase_body' => '{X-PLUGIN_NAME}にリンクが追加されたのでお知らせします。
+ルーム名: {X-ROOM}
+リンクリスト名: {X-BLOCK_NAME}
+リンク先: {X-LINK_URL}
+タイトル: {X-TITLE}
+カテゴリ: {X-CATEGORY_NAME}
+登録者: {X-USER}
+登録日時: {X-TO_DATE}
+説明:
+{X-DESCRIPTION}
+
+このリンクについて確認するには、下記アドレスへ
+{X-URL}',
),
),
);
diff --git a/Controller/LinksController.php b/Controller/LinksController.php
index 78260b0..ca29225 100644
--- a/Controller/LinksController.php
+++ b/Controller/LinksController.php
@@ -11,6 +11,7 @@
App::uses('LinksAppController', 'Links.Controller');
App::uses('HttpSocket', 'Network/Http');
+App::uses('MailSend', 'Mails.Utility');
/**
* Links Controller
@@ -196,6 +197,7 @@ public function add() {
unset($data['Link']['id'], $data['LinkOrder']['weight']);
if ($this->Link->saveLink($data)) {
+ MailSend::send();
return $this->redirect(NetCommonsUrl::backToPageUrl());
}
$this->NetCommons->handleValidationError($this->Link->validationErrors);
@@ -246,8 +248,8 @@ public function edit() {
unset($data['Link']['id']);
if ($this->Link->saveLink($data)) {
- $this->redirect(NetCommonsUrl::backToPageUrl());
- return;
+ MailSend::send();
+ return $this->redirect(NetCommonsUrl::backToPageUrl());
}
$this->NetCommons->handleValidationError($this->Link->validationErrors);
diff --git a/Locale/jpn/LC_MESSAGES/links.po b/Locale/jpn/LC_MESSAGES/links.po
index 7fef5c2..a88bf45 100644
--- a/Locale/jpn/LC_MESSAGES/links.po
+++ b/Locale/jpn/LC_MESSAGES/links.po
@@ -114,3 +114,7 @@ msgstr "リンクの作成"
#: Links/View/Links/index.ctp:37
msgid "Link creatable roles"
msgstr "リンクを追加できる権限"
+
+# メール関連
+msgid "MailSetting.mail_fixed_phrase_body.popover"
+msgstr "{X-SITE_NAME} : サイト名
{X-PLUGIN_NAME} : プラグイン名
{X-ROOM} : ルーム名
{X-BLOCK_NAME} : リンクリスト名
{X-LINK_URL} : リンク先
{X-TITLE} : タイトル
{X-CATEGORY_NAME} : カテゴリ
{X-DESCRIPTION} : 説明
{X-USER} : 登録者
{X-TO_DATE} : 登録日時
{X-URL} : 登録内容のURL" diff --git a/Model/Link.php b/Model/Link.php index d7b6ece..1eb58bd 100644 --- a/Model/Link.php +++ b/Model/Link.php @@ -31,6 +31,14 @@ class Link extends LinksAppModel { 'NetCommons.OriginalKey', 'Workflow.WorkflowComment', 'Workflow.Workflow', + 'Mails.MailQueue' => array( + 'embedTags' => array( + 'X-TITLE' => 'Link.title', + 'X-LINK_URL' => 'Link.url', + 'X-DESCRIPTION' => 'Link.description', + 'X-CATEGORY_NAME' => 'Category.name', + ), + ), ); /** @@ -187,6 +195,20 @@ public function saveLink($data) { 'LinkOrder' => 'Links.LinkOrder', ]); + //カテゴリ名をメールに含める + if (Hash::get($data, 'Link.category_id')) { + $categoryId = Hash::get($data, 'Link.category_id'); + $category = $this->Category->find('first', array( + 'recursive' => -1, + 'fields' => array('name'), + 'conditions' => array( + 'id' => $categoryId, + 'language_id' => Current::read('Language.id'), + ) + )); + $data = Hash::merge($data, $category); + } + //トランザクションBegin $this->begin(); diff --git a/View/LinkMailSettings/edit.ctp b/View/LinkMailSettings/edit.ctp index d311735..e3eb715 100644 --- a/View/LinkMailSettings/edit.ctp +++ b/View/LinkMailSettings/edit.ctp @@ -18,7 +18,7 @@ BlockTabs->block(BlockTabsHelper::MAIN_TAB_MAIL_SETTING); ?> element('Mails.edit_form', array( - 'mailBodyPopoverMessage' => __d('mails', 'MailSetting.mail_fixed_phrase_body.popover'), + 'mailBodyPopoverMessage' => __d('links', 'MailSetting.mail_fixed_phrase_body.popover'), 'cancelUrl' => NetCommonsUrl::backToIndexUrl('default_setting_action'), )); ?>
From 5377257ca8468a80517a94024ad0bf0c4290d8d8 Mon Sep 17 00:00:00 2001
From: s-nakajima
+ BlockTabs->main(BlockTabsHelper::MAIN_TAB_BLOCK_INDEX); ?>
+
+
From b585912f82e7468612096525ceae08938e283f0e Mon Sep 17 00:00:00 2001
From: s-nakajima
+ BlockTabs->block(BlockTabsHelper::MAIN_TAB_MAIL_SETTING); ?>
+
+ element('Mails.edit_form', array(
+ 'mailBodyPopoverMessage' => __d('mails', 'MailSetting.mail_fixed_phrase_body.popover'),
+ 'cancelUrl' => NetCommonsUrl::backToIndexUrl('default_setting_action'),
+ )); ?>
+
+{X-PLUGIN_NAME} : プラグイン名
{X-ROOM} : ルーム名
{X-BLOCK_NAME} : リンクリスト名
{X-LINK_URL} : リンク先
{X-TITLE} : タイトル
{X-CATEGORY_NAME} : カテゴリ
{X-DESCRIPTION} : 説明
{X-USER} : 登録者
{X-TO_DATE} : 登録日時
{X-URL} : 登録内容のURL" diff --git a/Model/Link.php b/Model/Link.php index d7b6ece..1eb58bd 100644 --- a/Model/Link.php +++ b/Model/Link.php @@ -31,6 +31,14 @@ class Link extends LinksAppModel { 'NetCommons.OriginalKey', 'Workflow.WorkflowComment', 'Workflow.Workflow', + 'Mails.MailQueue' => array( + 'embedTags' => array( + 'X-TITLE' => 'Link.title', + 'X-LINK_URL' => 'Link.url', + 'X-DESCRIPTION' => 'Link.description', + 'X-CATEGORY_NAME' => 'Category.name', + ), + ), ); /** @@ -187,6 +195,20 @@ public function saveLink($data) { 'LinkOrder' => 'Links.LinkOrder', ]); + //カテゴリ名をメールに含める + if (Hash::get($data, 'Link.category_id')) { + $categoryId = Hash::get($data, 'Link.category_id'); + $category = $this->Category->find('first', array( + 'recursive' => -1, + 'fields' => array('name'), + 'conditions' => array( + 'id' => $categoryId, + 'language_id' => Current::read('Language.id'), + ) + )); + $data = Hash::merge($data, $category); + } + //トランザクションBegin $this->begin(); diff --git a/View/LinkMailSettings/edit.ctp b/View/LinkMailSettings/edit.ctp index d311735..e3eb715 100644 --- a/View/LinkMailSettings/edit.ctp +++ b/View/LinkMailSettings/edit.ctp @@ -18,7 +18,7 @@ BlockTabs->block(BlockTabsHelper::MAIN_TAB_MAIL_SETTING); ?> element('Mails.edit_form', array( - 'mailBodyPopoverMessage' => __d('mails', 'MailSetting.mail_fixed_phrase_body.popover'), + 'mailBodyPopoverMessage' => __d('links', 'MailSetting.mail_fixed_phrase_body.popover'), 'cancelUrl' => NetCommonsUrl::backToIndexUrl('default_setting_action'), )); ?>
BlockTabs->block(BlockTabsHelper::MAIN_TAB_MAIL_SETTING); ?>
- element('Mails.edit_form', array(
- 'mailBodyPopoverMessage' => __d('links', 'MailSetting.mail_fixed_phrase_body.popover'),
- 'cancelUrl' => NetCommonsUrl::backToIndexUrl('default_setting_action'),
- )); ?>
+
+ MailForm->editFrom(
+ array(
+ array(
+ 'mailBodyPopoverMessage' => __d('links', 'MailSetting.mail_fixed_phrase_body.popover'),
+ ),
+ ),
+ NetCommonsUrl::backToIndexUrl('default_setting_action')
+ ); ?>
BlockTabs->block(BlockTabsHelper::BLOCK_TAB_SETTING); ?>
- element('Blocks.edit_form', array(
+ BlockForm->displayEditForm(array(
'model' => 'LinkBlock',
'callback' => 'Links.LinkBlocks/edit_form',
'cancelUrl' => NetCommonsUrl::backToIndexUrl('default_setting_action'),
+ 'displayModified' => true,
)); ?>
- request->params['action'] === 'edit') : ?>
- element('Blocks.delete_form', array(
- 'model' => 'LinkBlock',
- 'action' => NetCommonsUrl::actionUrl(array(
- 'controller' => $this->params['controller'],
- 'action' => 'delete',
- 'block_id' => Current::read('Block.id'),
- 'frame_id' => Current::read('Frame.id')
- )),
- 'callback' => 'Links.LinkBlocks/delete_form'
- )); ?>
-
+ BlockForm->displayDeleteForm(array(
+ 'callback' => 'Links.LinkBlocks/delete_form',
+ )); ?>
diff --git a/View/LinkBlocks/index.ctp b/View/LinkBlocks/index.ctp
index 38f7813..335ee2f 100644
--- a/View/LinkBlocks/index.ctp
+++ b/View/LinkBlocks/index.ctp
@@ -10,54 +10,61 @@
*/
?>
+
-
- element('Blocks.edit_form', array(
+ BlockForm->displayEditForm(array(
'model' => 'LinkFrameSetting',
- 'action' => NetCommonsUrl::actionUrl(array(
- 'controller' => $this->params['controller'],
- 'action' => 'edit',
- 'frame_id' => Current::read('Frame.id')
- )),
'callback' => 'Links.LinkFrameSettings/edit_form',
+ 'cancelUrl' => NetCommonsUrl::backToIndexUrl(),
)); ?>
-
+
- Button->addLink(); ?>
-
-
- NetCommonsForm->create('', array(
- 'url' => NetCommonsUrl::actionUrl(array('plugin' => 'frames', 'controller' => 'frames', 'action' => 'edit'))
- )); ?>
+ BlockIndex->description(); ?>
- NetCommonsForm->hidden('Frame.id'); ?>
+
+ BlockIndex->create(); ?>
+ BlockIndex->addLink(); ?>
-
+ BlockIndex->startTable(); ?>
- NetCommonsForm->end(); ?>
+ BlockIndex->endTable(); ?>
+
+ BlockIndex->end(); ?>
element('NetCommons.paginator'); ?>
-
-
-
-
diff --git a/View/LinkFrameSettings/edit.ctp b/View/LinkFrameSettings/edit.ctp
index 62624fb..f07d41b 100644
--- a/View/LinkFrameSettings/edit.ctp
+++ b/View/LinkFrameSettings/edit.ctp
@@ -21,7 +21,7 @@ $linkFrameSetting = NetCommonsAppController::camelizeKeyRecursive(
NetCommonsHtml->css('/links/css/style.css'); ?>
NetCommonsHtml->script('/links/js/links.js'); ?>
-| - | - Paginator->sort('Link.name', __d('links', 'Link list Title')); ?> - | -- Paginator->sort('Block.modified', __d('net_commons', 'Updated date')); ?> - | + BlockIndex->tableHeader( + 'Frame.block_id' + ); ?> + BlockIndex->tableHeader( + 'Block.name', __d('links', 'Link list Title'), + array('sort' => true) + ); ?> + BlockIndex->tableHeader( + 'TrackableCreator.handlename', __d('net_commons', 'Created user'), + array('sort' => true, 'type' => 'handle') + ); ?> + BlockIndex->tableHeader( + 'Block.modified', __d('net_commons', 'Modified datetime'), + array('sort' => true, 'type' => 'datetime') + ); ?>
|---|---|---|
| - BlockForm->displayFrame('Frame.block_id', $linkBlock['Block']['id']); ?> - | -- NetCommonsHtml->editLink($linkBlock['Block']['name'], array('block_id' => $linkBlock['Block']['id'])); ?> - | -- Date->dateFormat($linkBlock['Block']['modified']); ?> - | -
+