From 40db83fec913204a0b567d00518c24c2810223ab Mon Sep 17 00:00:00 2001 From: RikaFujiwara Date: Fri, 9 Nov 2018 09:30:48 +0000 Subject: [PATCH 1/3] =?UTF-8?q?refs=20#1368=20=E3=83=AB=E3=83=BC=E3=83=A0?= =?UTF-8?q?=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=81=A7=E6=89=BF=E8=AA=8D=E4=B8=8D?= =?UTF-8?q?=E8=A6=81=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B?= =?UTF-8?q?=E3=81=AB=E3=82=82=E9=96=A2=E3=82=8F=E3=82=89=E3=81=9A=E3=80=81?= =?UTF-8?q?=E3=82=AB=E3=83=AC=E3=83=B3=E3=83=80=E3=83=BC=E3=81=AE=E4=BA=88?= =?UTF-8?q?=E5=AE=9A=E3=81=A7=E6=89=BF=E8=AA=8D=E5=BE=85=E3=81=A1=E3=81=AB?= =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/CalendarPermission.php | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Model/CalendarPermission.php b/Model/CalendarPermission.php index e2a8254..02847ad 100644 --- a/Model/CalendarPermission.php +++ b/Model/CalendarPermission.php @@ -88,7 +88,8 @@ public function __construct($id = false, $table = null, $ds = null) { 'Room' => 'Rooms.Room', 'DefaultRolePermission' => 'Roles.DefaultRolePermission', 'RolesRoom' => 'Rooms.RolesRoom', - 'Block' => 'Blocks.Block' + 'Block' => 'Blocks.Block', + 'BlockSetting' => 'Blocks.BlockSetting' ]); } @@ -342,8 +343,22 @@ protected function _setBlockSetting(&$roomBlocks) { if (is_null($blockKey)) { $roomBlock[$this->alias]['use_workflow'] = Hash::get($roomBlock, 'Room.need_approval'); } else { - $blockSetting = $this->getBlockSetting($blockKey, $roomId); - $roomBlock[$this->alias]['use_workflow'] = $blockSetting[$this->alias]['use_workflow']; + //$blockSetting = $this->getBlockSetting($blockKey, $roomId); + $blockSetting = $this->BlockSetting->find('first', array( + 'conditions' => array( + 'plugin_key' => 'calendars', + 'room_id' => $roomId, + 'block_key' => $blockKey, + 'field_name' => 'use_workflow' + ), + 'recursive' => -1 + )); + $this->log($blockSetting, 'debug'); + if ($blockSetting) { + $roomBlock[$this->alias]['use_workflow'] = $blockSetting[$this->alias]['use_workflow']; + } else { + $roomBlock[$this->alias]['use_workflow'] = Hash::get($roomBlock, 'Room.need_approval'); + } } } } From 69a13d726fbe681642e2ae642e618d4549600015 Mon Sep 17 00:00:00 2001 From: RikaFujiwara Date: Fri, 9 Nov 2018 09:41:40 +0000 Subject: [PATCH 2/3] delete debug log --- .../Behavior/CalendarMonthlyEntryBehavior.php | 54 +++++++++---------- Model/CalendarPermission.php | 1 - 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/Model/Behavior/CalendarMonthlyEntryBehavior.php b/Model/Behavior/CalendarMonthlyEntryBehavior.php index a2bb989..106b80f 100644 --- a/Model/Behavior/CalendarMonthlyEntryBehavior.php +++ b/Model/Behavior/CalendarMonthlyEntryBehavior.php @@ -47,8 +47,8 @@ class CalendarMonthlyEntryBehavior extends CalendarAppBehavior { */ public function insertMonthlyByMonthday(Model &$model, $planParams, $rruleData, $eventData, $bymonthday, $first = 0, $createdUserWhenUpd = null) { - CakeLog::debug("DBG: insertMonthlyByMonthday() start. - rrule[INDEX]=[" . $model->rrule['INDEX'] . "]"); + //CakeLog::debug("DBG: insertMonthlyByMonthday() start. + // rrule[INDEX]=[" . $model->rrule['INDEX'] . "]"); $model->rrule['INDEX']++; @@ -61,10 +61,10 @@ public function insertMonthlyByMonthday(Model &$model, $planParams, $rruleData, $this->__setMonthlyByMonthdayStartDtProc($eventData, $userStartTime, $startTimestamp, $userTz, $currentDay, $first, $model, $interval, $intervalDay); - CakeLog::debug("DBG: 開始日付時刻処理. startTimestamp[" . $startTimestamp . "] - first[" . $first . "] currentDay[" . $currentDay . "] - rrule[BYMONTHDAY][0]=[" . $model->rrule['BYMONTHDAY'][0] . "] - interval[" . $interval . "] intervalDay[" . $intervalDay . "]"); + //CakeLog::debug("DBG: 開始日付時刻処理. startTimestamp[" . $startTimestamp . "] + // first[" . $first . "] currentDay[" . $currentDay . "] + // rrule[BYMONTHDAY][0]=[" . $model->rrule['BYMONTHDAY'][0] . "] + // interval[" . $interval . "] intervalDay[" . $intervalDay . "]"); //終了日付時刻の処理 //NC3は内部はサーバー系時刻なのでtimezoneDateはつかわない @@ -87,8 +87,8 @@ public function insertMonthlyByMonthday(Model &$model, $planParams, $rruleData, //開始日と終了日の差分日数の計算 $diffNum = ($endTimestamp - $startTimestamp) / 86400; - CakeLog::debug("DBG: 終了日付時刻処理. eTime[" . $eTime . "] - endTimestamp[" . $endTimestamp . "] 開始日と終了日の差分日数[" . $diffNum . "]"); + //CakeLog::debug("DBG: 終了日付時刻処理. eTime[" . $eTime . "] + // endTimestamp[" . $endTimestamp . "] 開始日と終了日の差分日数[" . $diffNum . "]"); //ユーザー系開始日、終了日をつかった、インターバル月数とインター //バル日数を考慮した開始・終了日付時刻の実計算 @@ -116,20 +116,20 @@ public function insertMonthlyByMonthday(Model &$model, $planParams, $rruleData, $svrEndDate = $date->format('Ymd'); $svrEndTime = $date->format('His'); - CakeLog::debug("DBG: startTimestamp[" . $startTimestamp . "] - svrStartDate[" . $svrStartDate . "] svrStartTime[" . $svrStartTime . "] - endTimestamp[" . $endTimestamp . "] svrEndDate[" . $svrEndDate . "] - svrEndTime[" . $svrEndTime . "]"); + //CakeLog::debug("DBG: startTimestamp[" . $startTimestamp . "] + // svrStartDate[" . $svrStartDate . "] svrStartTime[" . $svrStartTime . "] + // endTimestamp[" . $endTimestamp . "] svrEndDate[" . $svrEndDate . "] + // svrEndTime[" . $svrEndTime . "]"); if (!CalendarSupport::isRepeatable($model->rrule, ($svrStartDate . $svrStartTime), $eventData['CalendarEvent']['timezone_offset'], $model->isOverMaxRruleIndex)) { - CakeLog::debug("DBG: 繰返しがとまったので、callから復帰する。"); + //CakeLog::debug("DBG: 繰返しがとまったので、callから復帰する。"); //繰返しがとまったので、callから復帰する。 return true; } - CakeLog::debug("DBG: insert(svrStartDateTime[" . $svrStartDate . $svrStartTime . "] - svrEndDateTime[" . $svrEndDate . $svrEndTime . "])実行"); + //CakeLog::debug("DBG: insert(svrStartDateTime[" . $svrStartDate . $svrStartTime . "] + // svrEndDateTime[" . $svrEndDate . $svrEndTime . "])実行"); $rEventData = $this->insert($model, $planParams, $rruleData, $eventData, ($svrStartDate . $svrStartTime), ($svrEndDate . $svrEndTime), $createdUserWhenUpd); if ($rEventData['CalendarEvent']['id'] === null) { @@ -153,7 +153,7 @@ public function insertMonthlyByMonthday(Model &$model, $planParams, $rruleData, */ public function insertMonthlyByDay(Model &$model, $planParams, $rruleData, $eventData, $first = 0, $createdUserWhenUpd = null) { - CakeLog::debug("DBG: insertMonthlyByDay() start. rrule[INDEX]=[" . $model->rrule['INDEX'] . "]"); + //CakeLog::debug("DBG: insertMonthlyByDay() start. rrule[INDEX]=[" . $model->rrule['INDEX'] . "]"); $model->rrule['INDEX']++; //ユーザタイムゾーンを取得しておく。 @@ -162,13 +162,13 @@ public function insertMonthlyByDay(Model &$model, $planParams, $rruleData, $even //setStimeEtimeAndByday()返ってくる$sTime, $eTime, $bydayはすべてサーバー系日付時刻です。 $this->setStimeEtimeAndByday($model->rrule, $eventData, $first, $userTz, $sTime, $eTime, $byday); - CakeLog::debug("DBG: setStimeEtimeAndByday(first[" . $first . "] userTz[" . $userTz . "]) - 結果. sTime[" . $sTime . "] eTime[" . $eTime . "] byday[" . $byday . "]"); + //CakeLog::debug("DBG: setStimeEtimeAndByday(first[" . $first . "] userTz[" . $userTz . "]) + // 結果. sTime[" . $sTime . "] eTime[" . $eTime . "] byday[" . $byday . "]"); //call復帰条件のチェック if ($first && $sTime >= $byday) { - CakeLog::debug("DBG: first[" . $first . "] is TRUE and - sTime[" . $sTime . "] >= byday[" . $byday, "]. i DEC and ReCall."); + //CakeLog::debug("DBG: first[" . $first . "] is TRUE and + // sTime[" . $sTime . "] >= byday[" . $byday, "]. i DEC and ReCall."); //開始日(対象日？）が繰返しENDのb(第x週第y曜日の実日）を超したら、行き過ぎなので、INDEXをデクリメントして、自分を再帰callする。 $model->rrule['INDEX']--; return $this->insertMonthlyByDay($model, $planParams, $rruleData, $eventData, @@ -180,22 +180,22 @@ public function insertMonthlyByDay(Model &$model, $planParams, $rruleData, $even $this->setStartDateTiemAndEndDateTime($sTime, $eTime, $byday, $userTz, $svrStartDate, $svrStartTime, $svrEndDate, $svrEndTime); - CakeLog::debug("DBG: setStartDateTiemAndEndDateTime処理結果. - svrStartDate[" . $svrStartDate . "] svrStartTime[" . $svrStartTime . "] - svrEndDate[" . $svrEndDate . "] svrEndTime[" . $svrEndTime . "]"); + //CakeLog::debug("DBG: setStartDateTiemAndEndDateTime処理結果. + // svrStartDate[" . $svrStartDate . "] svrStartTime[" . $svrStartTime . "] + // svrEndDate[" . $svrEndDate . "] svrEndTime[" . $svrEndTime . "]"); if (!CalendarSupport::isRepeatable($model->rrule, ($svrStartDate . $svrStartTime), $eventData['CalendarEvent']['timezone_offset'], $model->isOverMaxRruleIndex)) { - CakeLog::debug("DBG: isRepeatable() がFALSEを返したので、 - 繰返しをとめて復帰します。"); + //CakeLog::debug("DBG: isRepeatable() がFALSEを返したので、 + // 繰返しをとめて復帰します。"); //繰り返しがとまったので、復帰いたします。 return true; } - CakeLog::debug("DBG: insert(svrStartDateTime[" . $svrStartDate . $svrStartTime . "] - svrEndDateTime[" . $svrEndDate . $svrEndTime . "])実行"); + //CakeLog::debug("DBG: insert(svrStartDateTime[" . $svrStartDate . $svrStartTime . "] + // svrEndDateTime[" . $svrEndDate . $svrEndTime . "])実行"); $rEventData = $this->insert($model, $planParams, $rruleData, $eventData, ($svrStartDate . $svrStartTime), ($svrEndDate . $svrEndTime), $createdUserWhenUpd); diff --git a/Model/CalendarPermission.php b/Model/CalendarPermission.php index 02847ad..ed494b0 100644 --- a/Model/CalendarPermission.php +++ b/Model/CalendarPermission.php @@ -353,7 +353,6 @@ protected function _setBlockSetting(&$roomBlocks) { ), 'recursive' => -1 )); - $this->log($blockSetting, 'debug'); if ($blockSetting) { $roomBlock[$this->alias]['use_workflow'] = $blockSetting[$this->alias]['use_workflow']; } else { From 3afa91d14e0a2da95d1178d6c9eae01708caba65 Mon Sep 17 00:00:00 2001 From: RikaFujiwara Date: Fri, 9 Nov 2018 10:39:52 +0000 Subject: [PATCH 3/3] fix travis error --- View/Helper/CalendarShareUsersHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/View/Helper/CalendarShareUsersHelper.php b/View/Helper/CalendarShareUsersHelper.php index 181a4d9..9cc0bb4 100644 --- a/View/Helper/CalendarShareUsersHelper.php +++ b/View/Helper/CalendarShareUsersHelper.php @@ -68,7 +68,7 @@ public function getCalendarShareUser($vars, $event, $shareUsers) { $html = ''; foreach ($shareUsers as $shareUser) { $html .= $this->DisplayUser->handleLink($shareUser, - array('avatar' => true), null, 'User'); + array('avatar' => true), array(), 'User'); $html .= ',  '; } $html = trim($html, ',  ');