From 9fc73470fc667ac38243e7b2013beec091f5f7fe Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 17 Mar 2021 11:51:05 +0900 Subject: [PATCH 01/28] =?UTF-8?q?fix:=20=E6=96=B0=E7=9D=80=E6=83=85?= =?UTF-8?q?=E5=A0=B1=E3=81=8B=E3=82=89=E9=81=B7=E7=A7=BB=E3=81=97=E3=81=9F?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=80=81=E4=BA=88=E5=AE=9A=E3=81=8B=E3=82=89?= =?UTF-8?q?=E3=82=AB=E3=83=AC=E3=83=B3=E3=83=80=E3=83=BC=E3=82=92=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E3=81=97=E3=81=A6=E3=81=82=E3=82=8B=E3=83=95=E3=83=AC?= =?UTF-8?q?=E3=83=BC=E3=83=A0=E3=81=AB=E9=81=B7=E7=A7=BB=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=20https://github.?= =?UTF-8?q?com/researchmap/RmNetCommons3/issues/1217?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/CalendarPlansController.php | 17 +++++++++-------- Model/CalendarFrameSetting.php | 21 ++++++++++++++++++++- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/Controller/CalendarPlansController.php b/Controller/CalendarPlansController.php index 3b2fddb..f6d070c 100644 --- a/Controller/CalendarPlansController.php +++ b/Controller/CalendarPlansController.php @@ -147,14 +147,15 @@ class CalendarPlansController extends CalendarsAppController { * @return void */ public function beforeFilter() { - //if (empty($this->request->params['?']['frame_id']) && - // !empty($this->request->params['key'])) { - // //新着情報から来た際、予定(calendar_eventsテーブル)keyからフレームIDを取得して、表示させる - // $frameId = $this->CalendarFrameSetting->getFrameIdByEventKey($this->request->params['key']); - // if ($frameId) { - // $this->request->params['?']['frame_id'] = $frameId; - // } - //} + if ($this->params['action'] === 'view' && + empty($this->request->params['?']['frame_id']) && + !empty($this->request->params['key'])) { + //新着情報から来た際、予定(calendar_eventsテーブル)keyからフレームIDを取得して、表示させる + $frameId = $this->CalendarFrameSetting->getFrameIdByEventKey($this->request->params['key']); + if ($frameId) { + $this->request->params['?']['frame_id'] = $frameId; + } + } parent::beforeFilter(); diff --git a/Model/CalendarFrameSetting.php b/Model/CalendarFrameSetting.php index 496fad3..f072360 100644 --- a/Model/CalendarFrameSetting.php +++ b/Model/CalendarFrameSetting.php @@ -348,11 +348,16 @@ public function getDefaultFrameSetting() { /** * カレンダーの予定(calendar_eventsテーブル)keyからframe_idを取得し、返す * + * 特に新着情報から遷移したときにそのルームに配置してあるカレンダーに遷移するために使用する + * * @param string $eventKey $eventKey * @return int|null フレームID */ public function getFrameIdByEventKey($eventKey) { - $this->loadModels(['CalendarEvent' => 'Calendars.CalendarEvent']); + $this->loadModels([ + 'CalendarEvent' => 'Calendars.CalendarEvent', + 'Block' => 'Blocks.Block', + ]); $event = $this->CalendarEvent->find('first', [ 'recursive' => -1, @@ -377,6 +382,20 @@ public function getFrameIdByEventKey($eventKey) { $this->Frame->alias . '.plugin_key' => 'calendars', $this->Frame->alias . '.room_id' => $event[$this->CalendarEvent->alias]['room_id'], ], + 'joins' => [ + //HACK: v3をリリースした直後の古いバージョンで不具合があり、 + //　　　framesのroom_idとblocksのroom_idが異なる場合がある。 + //　　　そのためエラーになるためJOINして正しいフレームを対象とする + [ + 'type' => 'INNER', + 'table' => $this->Block->table, + 'alias' => $this->Block->alias, + 'conditions' => [ + 'Frame.block_id = Block.id', + 'Frame.room_id = Block.room_id', + ], + ], + ], 'order' => [ $this->Frame->alias . '.id' => 'asc', ], From 95a3f7494089534508aaf511762dc0d686f057a7 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 17 Mar 2021 11:59:13 +0900 Subject: [PATCH 02/28] =?UTF-8?q?fix:=20test:=20phpcs=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/Helper/CalendarDailyHelper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/View/Helper/CalendarDailyHelper.php b/View/Helper/CalendarDailyHelper.php index 95d6555..b0d42c7 100644 --- a/View/Helper/CalendarDailyHelper.php +++ b/View/Helper/CalendarDailyHelper.php @@ -88,7 +88,8 @@ public function getPlanSummariesHtml($vars, $year, $month, $day, $fromTime, $toT $html .= "
"; //１プランの開始 //$html .= "

"; - $html .= $this->getPlanTitleDailyListHtml($vars, $year, $month, $day, $fromTime, $toTime, $plan); + $html .= $this->getPlanTitleDailyListHtml( + $vars, $year, $month, $day, $fromTime, $toTime, $plan); // 1プランの終了 $html .= "

"; From 33f584c9aa4f87d3b588484f09181806be8030ec Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 17 Mar 2021 14:49:19 +0900 Subject: [PATCH 03/28] =?UTF-8?q?style:=20=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/CalendarsAppController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Controller/CalendarsAppController.php b/Controller/CalendarsAppController.php index a689970..983bf16 100644 --- a/Controller/CalendarsAppController.php +++ b/Controller/CalendarsAppController.php @@ -25,7 +25,7 @@ * @property \CalendarEventSelectRoom $CalendarEventSelectRoom * @property \CalendarActionPlan $CalendarActionPlan * @property \Room $Room - * @property \RoomsLanguages $RoomsLanguages + * @property \RoomsAppModel $RoomsLanguages * * @author Allcreator * @package NetCommons\Calendars\Controller @@ -55,6 +55,9 @@ class CalendarsAppController extends AppController { 'Calendars.CalendarEventSelectRoom', 'Calendars.CalendarActionPlan', 'Rooms.Room', + //HACK: RoomsLanguagesモデルがないため、RoomsAppModelが使用されている。 + //　　　(Cakeが良い感じにRooms.RoomsAppModelを使用するようにしている模様) + //　　　本来、正しいモデルを使用するように直すべきだが、多岐にわたり使用されているためそのままとする。 'Rooms.RoomsLanguages', //pending ); From 20fe5456fa35c1c4a298f5c00d6850cdaa727f49 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 17 Mar 2021 17:31:34 +0900 Subject: [PATCH 04/28] =?UTF-8?q?refactor:=20=E4=B8=8D=E8=A6=81=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=89=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/CalendarsAppController.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Controller/CalendarsAppController.php b/Controller/CalendarsAppController.php index 983bf16..5fcd1c3 100644 --- a/Controller/CalendarsAppController.php +++ b/Controller/CalendarsAppController.php @@ -245,12 +245,6 @@ protected function _setCalendarCommonVars($vars) { $order = array('CalendarEvent' . '.dtstart'); } - $vars['parentIdType'] = array( //これも共通なので含めておく。 - 'public' => Space::getRoomIdRoot(Space::PUBLIC_SPACE_ID), //公開 - 'private' => Space::getRoomIdRoot(Space::PRIVATE_SPACE_ID), //プライベート - 'member' => Space::getRoomIdRoot(Space::COMMUNITY_SPACE_ID), //全会員 - ); - //room_idとspace_idの対応表を載せておく。 $vars = $this->__setRoomInfos($vars); From 148b0e8a747e6d0c5d9ebdf7d2c0477952d9e571 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 17 Mar 2021 19:26:48 +0900 Subject: [PATCH 05/28] =?UTF-8?q?refactor:=20=E3=82=BB=E3=83=83=E3=83=88?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E5=A4=89=E6=95=B0=E3=81=8C?= =?UTF-8?q?=E9=96=93=E9=81=95=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B=E3=81=9F?= =?UTF-8?q?=E3=82=81=E4=BF=AE=E6=AD=A3=E3=80=82=E3=81=9F=E3=81=A0=E3=81=97?= =?UTF-8?q?=E3=80=81=E3=81=93=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=82=92=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=82=82=E6=84=8F=E5=91=B3=E3=81=AF=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=80=82=20=E6=9C=AC=E6=9D=A5=E3=80=81=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E3=81=97=E3=82=88=E3=81=86=E3=81=A8=E3=81=97=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=9F=E5=87=A6=E7=90=86=E3=81=A8=E3=81=97=E3=81=A6=E3=81=AF?= =?UTF-8?q?=E3=80=81=20https://github.com/NetCommons3/Calendars/blob/3.3.3?= =?UTF-8?q?.1/Model/Behavior/CalendarPlanGenerationBehavior.php#L277-L294?= =?UTF-8?q?=20=E3=81=A7=E3=81=AF=E3=81=82=E3=82=8B=E3=81=8C=E3=80=81=20htt?= =?UTF-8?q?ps://github.com/NetCommons3/Calendars/blob/3.3.3.1/Controller/C?= =?UTF-8?q?alendarPlansController.php#L378-L384=20=E3=81=A7=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E3=81=9F=E3=82=81?= =?UTF-8?q?=E3=80=81=20https://github.com/NetCommons3/Calendars/blob/3.3.3?= =?UTF-8?q?.1/Controller/CalendarPlansController.php#L390-L392=20=E3=81=A7?= =?UTF-8?q?=20$isMyPrivateRoom=20=E3=81=AB=E3=81=97=E3=81=A6=E3=82=82?= =?UTF-8?q?=E3=80=81=E3=81=8A=E3=81=9D=E3=82=89=E3=81=8F=E7=84=A1=E6=84=8F?= =?UTF-8?q?=E5=91=B3=E3=81=A7=E3=81=AF=E3=81=82=E3=82=8B=EF=BC=88=EF=BC=9F?= =?UTF-8?q?=EF=BC=89=E3=81=8C=E3=80=81=E5=BE=8C=E3=81=A7=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=83=89=E8=A6=8B=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB=E7=96=91?= =?UTF-8?q?=E5=95=8F=E3=81=AB=E6=80=9D=E3=81=86=E3=81=9F=E3=82=81=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=A6=E3=81=8A=E3=81=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/CalendarPlansController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/CalendarPlansController.php b/Controller/CalendarPlansController.php index 73587bb..c4a1e21 100644 --- a/Controller/CalendarPlansController.php +++ b/Controller/CalendarPlansController.php @@ -420,7 +420,7 @@ protected function _calendarPost() { $eventId = $this->CalendarActionPlan->saveCalendarPlan( $this->request->data, $procMode, $isOriginRepeat, $isTimeMod, $isRepeatMod, - $createdUserWhenUpd, $this->_myself); + $createdUserWhenUpd, $isMyPrivateRoom); if (!$eventId) { //保存失敗 CakeLog::error("保存失敗"); //FIXME: エラー処理を記述のこと。 From b58b42dc566f7bbee96b77905d552e5905a1bd8e Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 19 Mar 2021 08:06:10 +0900 Subject: [PATCH 06/28] =?UTF-8?q?refactor:=20$this->request->params['=3F']?= =?UTF-8?q?=E3=81=A7=E3=82=82=E5=95=8F=E9=A1=8C=E3=81=AA=E3=81=84=E3=81=8C?= =?UTF-8?q?=E3=80=81=E9=80=9A=E5=B8=B8=E3=81=AF$this->request->query?= =?UTF-8?q?=E3=82=92=E4=BD=BF=E3=81=86=E3=81=9F=E3=82=81=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=20https://github.com/researchmap/RmNetCommons3/issues/1217?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/CalendarPlansController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Controller/CalendarPlansController.php b/Controller/CalendarPlansController.php index 73587bb..ee85b0d 100644 --- a/Controller/CalendarPlansController.php +++ b/Controller/CalendarPlansController.php @@ -154,12 +154,12 @@ class CalendarPlansController extends CalendarsAppController { */ public function beforeFilter() { if ($this->params['action'] === 'view' && - empty($this->request->params['?']['frame_id']) && + empty($this->request->query['frame_id']) && !empty($this->request->params['key'])) { //新着情報から来た際、予定(calendar_eventsテーブル)keyからフレームIDを取得して、表示させる $frameId = $this->CalendarFrameSetting->getFrameIdByEventKey($this->request->params['key']); if ($frameId) { - $this->request->params['?']['frame_id'] = $frameId; + $this->request->query['frame_id'] = $frameId; } } From 5a70382cf01f09c9aeb8770af3b2ce25551d65d4 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Tue, 23 Mar 2021 13:56:35 +0900 Subject: [PATCH 07/28] =?UTF-8?q?change:=20=E6=97=A5=E5=88=A5=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E3=81=A7=E4=BA=88=E5=AE=9A=E3=81=8C1=E4=BB=B6?= =?UTF-8?q?=E3=82=82=E3=81=AA=E3=81=84=E3=81=A8=E3=81=8D=E3=81=AB=E3=83=A1?= =?UTF-8?q?=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=82=92=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= =?UTF-8?q?=E9=9A=9B=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=83=9F=E3=82=B9=E3=81=A7?= =?UTF-8?q?=E4=BD=99=E8=A8=88=E3=81=AAtable=E3=82=BF=E3=82=B0=E3=81=8C?= =?UTF-8?q?=E5=87=BA=E5=8A=9B=E3=81=95=E3=82=8C=E3=81=A6=E3=81=97=E3=81=BE?= =?UTF-8?q?=E3=81=86=E3=81=9F=E3=82=81=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/Elements/Calendars/daily_list.ctp | 28 +++++++++++++++++--------- View/Helper/CalendarDailyHelper.php | 3 --- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/View/Elements/Calendars/daily_list.ctp b/View/Elements/Calendars/daily_list.ctp index 5df05c2..031f619 100644 --- a/View/Elements/Calendars/daily_list.ctp +++ b/View/Elements/Calendars/daily_list.ctp @@ -8,15 +8,23 @@ * @license http://www.netcommons.org/license.txt NetCommons License * @copyright Copyright 2014, NetCommons Project */ + +$dailyListBody = $this->CalendarDaily->makeDailyListBodyHtml($vars); ?> -
-
- - - CalendarDaily->makeDailyListBodyHtml($vars); - ?> - -
+ +
+
+ + + + +
+
-
\ No newline at end of file + +

+ +

+"; $html .= "
"; } - } else { - $html .= '

' . - __d('calendars', 'No plan.') . '

'; } return $html; } From 39f42e67b73b9eb83a64cc5b7a12d7d157a59cd7 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Mon, 2 Aug 2021 18:01:55 +0900 Subject: [PATCH 08/28] =?UTF-8?q?fix:=20callbacks=E3=82=92=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E3=81=97=E3=81=A6=E3=80=81actAs=E3=81=8C=E5=8B=95?= =?UTF-8?q?=E3=81=8B=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20https://github.com/NetCommons3/NetCommons3/issues/1?= =?UTF-8?q?562?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Behavior/CalendarAppBehavior.php | 2 +- Model/Behavior/CalendarInsertPlanBehavior.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Model/Behavior/CalendarAppBehavior.php b/Model/Behavior/CalendarAppBehavior.php index 7fceed2..6deb266 100644 --- a/Model/Behavior/CalendarAppBehavior.php +++ b/Model/Behavior/CalendarAppBehavior.php @@ -173,7 +173,7 @@ public function insert(Model $model, $planParams, $rruleData, $eventData, $start if ($model->CalendarEvent->id > 0 && $createdUserWhenUpd !== null) { //saveが成功し、かつ、createdUserWhenUpd がnull以外なら、created_userを更新しておく。 //modifiedも更新されるが、saveの直後なので誤差の範囲として了とする。 - $model->CalendarEvent->saveField('created_user', $createdUserWhenUpd); + $model->CalendarEvent->saveField('created_user', $createdUserWhenUpd, ['callbacks' => false]); //UPDATEでセットしたcreatedUserWhenUpdの値をeventDataに記録しておく $rEventData['CalendarEvent']['created_user'] = $createdUserWhenUpd; } diff --git a/Model/Behavior/CalendarInsertPlanBehavior.php b/Model/Behavior/CalendarInsertPlanBehavior.php index 6c51c81..e91d187 100644 --- a/Model/Behavior/CalendarInsertPlanBehavior.php +++ b/Model/Behavior/CalendarInsertPlanBehavior.php @@ -165,7 +165,7 @@ public function insertEventData(Model $model, $planParams, $rruleData, if ($model->CalendarEvent->id > 0 && $createdUserWhenUpd !== null) { //saveが成功し、かつ、createdUserWhenUpd がnull以外なら、created_userを更新しておく。 //modifiedも更新されるが、saveの直後なので誤差の範囲として了とする。 - $model->CalendarEvent->saveField('created_user', $createdUserWhenUpd); + $model->CalendarEvent->saveField('created_user', $createdUserWhenUpd, ['callbacks' => false]); //UPDATEでセットしたcreatedUserWhenUpdの値をeventDataに記録しておく $eventData['CalendarEvent']['created_user'] = $createdUserWhenUpd; } From 8958a49ad5b46a663f0690970b2b809d3b347909 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Mon, 2 Aug 2021 18:02:21 +0900 Subject: [PATCH 09/28] =?UTF-8?q?change:=20test:=20TravisCI=E3=81=8B?= =?UTF-8?q?=E3=82=89GithubAction=E3=81=AB=E5=A4=89=E6=9B=B4=20https://gith?= =?UTF-8?q?ub.com/NetCommons3/NetCommons3/issues/1650?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 137 ++++++++++++++++++++++++++++++++++++ .travis.yml | 42 ----------- README.md | 10 +-- phpunit.xml.dist | 4 +- 4 files changed, 141 insertions(+), 52 deletions(-) create mode 100644 .github/workflows/tests.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..d6bd01e --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,137 @@ +on: + push: + branches: + - main + - master + - availability + pull_request: + branches: + - main + - master + - availability + +name: tests + +jobs: + tests: + name: tests + runs-on: ubuntu-18.04 + strategy: + matrix: + php: [ '7.1', '7.2', '7.3', '7.4' ] + + env: + NC3_BUILD_DIR: "/opt/nc3" + NC3_DOCKER_DIR: "/opt/docker" + NC3_GIT_URL: "git://github.com/NetCommons3/NetCommons3.git" + NC3_GIT_BRANCH: "master" + PLUGIN_BUILD_DIR: ${{ github.workspace }} + PHP_VERSION: ${{ matrix.php }} + MYSQL_ROOT_PASSWORD: root + MYSQL_DATABASE: cakephp_test + + steps: + - uses: actions/checkout@v2 + + - name: environment + run: | + echo "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}" + echo "PLUGIN_BUILD_DIR=${PLUGIN_BUILD_DIR}" + echo "PHP_VERSION=${PHP_VERSION}" + ls -al ${PLUGIN_BUILD_DIR} + + - name: docker-compose install + run: | + curl -L https://github.com/docker/compose/releases/download/1.11.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose + chmod +x ~/docker-compose + sudo mv ~/docker-compose /usr/local/bin/docker-compose + docker-compose --version + + - name: git clone nc3 + run: git clone -b ${NC3_GIT_BRANCH} ${NC3_GIT_URL} ${NC3_BUILD_DIR} + + - name: git clone nc3_docker + run: git clone https://github.com/NetCommons3/nc3app-docker.git ${NC3_DOCKER_DIR} + + - name: docker-compose start + run: | + cd ${NC3_DOCKER_DIR} + docker-compose up -d + docker-compose start + + - run: docker ps + + - name: check libraries + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/start-on-docker.sh + + - name: nc3 build + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/app-build.sh + + - name: phpcs (PHP CodeSniffer) + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/phpcs.sh + + - name: phpmd (PHP Mess Detector) + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/phpmd.sh + + - name: phpcpd (PHP Copy/Paste Detector) + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/phpcpd.sh + + - name: gjslint (JavaScript Style Check) + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/gjslint.sh + + - name: phpdoc (PHP Documentor) + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/phpdoc.sh + + - name: phpunit (PHP UnitTest) + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/phpunit.sh + sudo -s chmod a+w -R ${NC3_BUILD_DIR}/build + + - name: push coveralls + env: + COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} + COVERALLS_FLAG_NAME: ${{ matrix.php }} + run: | + cd ${NC3_BUILD_DIR} + ls -la ${NC3_BUILD_DIR} + vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v + + - name: docker-compose remove + run: | + cd ${NC3_DOCKER_DIR} + docker-compose rm -f + + # テスト成功時はこちらのステップが実行される + - name: Slack Notification on Success + if: success() + uses: rtCamp/action-slack-notify@v2.2.0 + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + SLACK_CHANNEL: notify-netcommons3 + SLACK_TITLE: "${{ github.repository }}(${{ matrix.php }})" + SLACK_COLOR: good + + # テスト失敗時はこちらのステップが実行される + - name: Slack Notification on Failure + uses: rtCamp/action-slack-notify@v2.2.0 + if: failure() + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + SLACK_CHANNEL: notify-netcommons3 + SLACK_TITLE: "${{ github.repository }}(${{ matrix.php }})" + SLACK_COLOR: danger diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index beefe09..0000000 --- a/.travis.yml +++ /dev/null @@ -1,42 +0,0 @@ -language: php - -php: - - 7.0 - - 7.1 - - 7.2 - - 7.3.24 - - 7.4 - -sudo: false -dist: trusty - -env: - matrix: - - NETCOMMONS_VERSION=master DB=mysql - global: - - secure: "OfqRkPfSzBeU288mu0hEktEoWMZxxcYJN9BzrDrrXgTPCev5C7URonk+71pCB3L5+pI8fD/mBanhqFgClpe1tJdmt0m6BJ6woLMSNJT/1jdxX6C55gIaKPfutO0Of1GQ8K6ibHnlgrgsk/mGwRDH01u3k0qkL3saPNrVlBgmC5E=" - - GIT_COMMITTER_NAME=to-hashimoto-3 - - GIT_COMMITTER_EMAIL=toshihide@allcreaotr.net - - GIT_AUTHOR_NAME=AllCreator - - GIT_AUTHOR_EMAIL=info@allcreator.net - -before_script: - - export NETCOMMONS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/NetCommons3 - - git clone git://github.com/NetCommons3/NetCommons3 $NETCOMMONS_BUILD_DIR - - cd $NETCOMMONS_BUILD_DIR - - git checkout $NETCOMMONS_VERSION - - travis_wait . tools/build/plugins/cakephp/travis/pre.sh - - . tools/build/plugins/cakephp/travis/environment.sh - -script: - - . tools/build/plugins/cakephp/travis/main.sh - -after_script: - - . tools/build/plugins/cakephp/travis/post.sh - -notifications: - email: - recipients: - - netcommons3@googlegroups.com - on_success: never # default: change - on_failure: always # default: always diff --git a/README.md b/README.md index 2f90a10..2d46268 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,6 @@ Calendars ========= -Calendars for NetCommons3 -[![Build Status](https://travis-ci.org/NetCommons3/Calendars.svg?branch=master)](https://travis-ci.org/NetCommons3/Calendars) -[![Coverage Status](https://img.shields.io/coveralls/NetCommons3/Calendars.svg)](https://coveralls.io/r/NetCommons3/Calendars?branch=master) - -| dependencies | status | -| ------------ | ------ | -| composer.json | [![Dependency Status](https://www.versioneye.com/user/projects/5732eaddfb70190010fad6a1/badge.svg?style=flat)](https://www.versioneye.com/user/projects/5732eaddfb70190010fad6a1) | +[![Tests Status](https://github.com/NetCommons3/Calendars/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/NetCommons3/Calendars/actions/workflows/tests.yml) +[![Coverage Status](https://coveralls.io/repos/NetCommons3/Calendars/badge.svg?branch=master)](https://coveralls.io/r/NetCommons3/Calendars?branch=master) +[![Stable Version](https://img.shields.io/packagist/v/netcommons/calendars.svg?label=stable)](https://packagist.org/packages/netcommons/calendars) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 77b8f90..e6b92cd 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -3,9 +3,6 @@ - - - app/Plugin/Calendars @@ -20,5 +17,6 @@ + From 9fa6f7b8ae1d9763dc0cbee3f7da5bbeacd48335 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Tue, 10 Aug 2021 22:10:29 +0900 Subject: [PATCH 10/28] =?UTF-8?q?change:=20test:=20Slack=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3,=20mysql8.0=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=20https://github.com/NetCommons3/NetCommons3?= =?UTF-8?q?/issues/1650?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 35 ++++++++++++++++++++++++-- .github/workflows/tests.yml | 47 +++++++++++++++++++++++++---------- 2 files changed, 67 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a3225bc..592d72f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,16 +4,25 @@ on: tags: - '3*' -name: Create Release +name: create_release jobs: build: - name: Create Release + name: create_release runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v2 + - name: Slack Notification on Start + uses: rtCamp/action-slack-notify@v2.2.0 + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_RELEASE }} + SLACK_CHANNEL: notify-nc3-release + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: "#f0ad4e" + SLACK_MESSAGE: "Start Job" + - name: Create Release id: create_release uses: actions/create-release@v1 @@ -26,3 +35,25 @@ jobs: NetCommons ${{ github.ref }} released. draft: false prerelease: false + + # テスト成功時はこちらのステップが実行される + - name: Slack Notification on Finish + uses: rtCamp/action-slack-notify@v2.2.0 + if: success() + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_RELEASE }} + SLACK_CHANNEL: notify-nc3-release + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: good + SLACK_MESSAGE: "Job Success" + + # テスト失敗時はこちらのステップが実行される + - name: Slack Notification on Failure + uses: rtCamp/action-slack-notify@v2.2.0 + if: failure() + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_RELEASE }} + SLACK_CHANNEL: notify-nc3-tests + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: danger + SLACK_MESSAGE: "Job Failure" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d6bd01e..1477ea2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,12 +13,26 @@ on: name: tests jobs: + setup: + name: setup + runs-on: ubuntu-18.04 + steps: + - name: Slack Notification on Start + uses: rtCamp/action-slack-notify@v2.2.0 + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} + SLACK_CHANNEL: notify-nc3-tests + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: "#f0ad4e" + tests: name: tests + needs: setup runs-on: ubuntu-18.04 strategy: matrix: php: [ '7.1', '7.2', '7.3', '7.4' ] + mysql: [ '5.7', '8.0' ] env: NC3_BUILD_DIR: "/opt/nc3" @@ -27,6 +41,7 @@ jobs: NC3_GIT_BRANCH: "master" PLUGIN_BUILD_DIR: ${{ github.workspace }} PHP_VERSION: ${{ matrix.php }} + MYSQL_VERSION: ${{ matrix.mysql }} MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: cakephp_test @@ -38,6 +53,7 @@ jobs: echo "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}" echo "PLUGIN_BUILD_DIR=${PLUGIN_BUILD_DIR}" echo "PHP_VERSION=${PHP_VERSION}" + echo "MYSQL_VERSION=${MYSQL_VERSION}" ls -al ${PLUGIN_BUILD_DIR} - name: docker-compose install @@ -116,22 +132,27 @@ jobs: cd ${NC3_DOCKER_DIR} docker-compose rm -f - # テスト成功時はこちらのステップが実行される - - name: Slack Notification on Success - if: success() - uses: rtCamp/action-slack-notify@v2.2.0 - env: - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - SLACK_CHANNEL: notify-netcommons3 - SLACK_TITLE: "${{ github.repository }}(${{ matrix.php }})" - SLACK_COLOR: good - # テスト失敗時はこちらのステップが実行される - name: Slack Notification on Failure uses: rtCamp/action-slack-notify@v2.2.0 if: failure() env: - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - SLACK_CHANNEL: notify-netcommons3 - SLACK_TITLE: "${{ github.repository }}(${{ matrix.php }})" + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} + SLACK_CHANNEL: notify-nc3-tests + SLACK_TITLE: "${{ github.repository }}(php${{ matrix.php }}, mysql${{ matrix.mysql }})" SLACK_COLOR: danger + + teardown: + name: teardown + runs-on: ubuntu-18.04 + needs: tests + steps: + # テスト成功時はこちらのステップが実行される + - name: Slack Notification on Success + if: success() + uses: rtCamp/action-slack-notify@v2.2.0 + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} + SLACK_CHANNEL: notify-nc3-tests + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: good From 0890b2d496998ceb65febbf7de1ff555c4106587 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 13 Aug 2021 14:52:01 +0900 Subject: [PATCH 11/28] change: Version number to 3.3.4 --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 619b537..a0891f5 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.3.3 +3.3.4 From 1d004f4920b2356b247290029f03baa6f80e9fd5 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Thu, 30 Sep 2021 18:35:07 +0900 Subject: [PATCH 12/28] =?UTF-8?q?change:=20=20=E3=83=87=E3=82=A4=E3=83=AA?= =?UTF-8?q?=E3=83=BC=E3=83=AA=E3=83=B3=E3=82=AF=E3=81=AE=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=80=9F=E5=BA=A6=E3=82=92=E5=90=91=E4=B8=8A=E3=80=82Router?= =?UTF-8?q?=E5=AE=9A=E7=BE=A9=E3=81=8C=E5=A4=9A=E3=81=84=E3=81=A8Router::u?= =?UTF-8?q?rl=E3=81=8C=E9=81=85=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=8F=E3=81=AE=E3=81=A7=E3=80=81=E3=83=87=E3=82=A4?= =?UTF-8?q?=E3=83=AA=E3=83=BC=E3=83=AA=E3=83=B3=E3=82=AF=E3=81=AE=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=99=82=E3=81=ABRouter::url=E3=82=92=E4=B8=80?= =?UTF-8?q?=E5=BA=A6=E3=81=A0=E3=81=91=E4=BD=BF=E3=81=86=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/CalendarsController.php | 1 + .../GetCalendarDailyUrlTest.php | 27 +++++++++++ View/Helper/CalendarUrlHelper.php | 46 +++++++++++++------ 3 files changed, 59 insertions(+), 15 deletions(-) create mode 100644 Test/Case/View/Helper/CalendarUrlHelper/GetCalendarDailyUrlTest.php diff --git a/Controller/CalendarsController.php b/Controller/CalendarsController.php index 4a34010..8b636de 100644 --- a/Controller/CalendarsController.php +++ b/Controller/CalendarsController.php @@ -80,6 +80,7 @@ class CalendarsController extends CalendarsAppController { 'Calendars.CalendarTurnCalendar', 'Calendars.CalendarLegend', 'Calendars.CalendarButton', + 'Calendars.CalendarUrl', ); /** diff --git a/Test/Case/View/Helper/CalendarUrlHelper/GetCalendarDailyUrlTest.php b/Test/Case/View/Helper/CalendarUrlHelper/GetCalendarDailyUrlTest.php new file mode 100644 index 0000000..1071127 --- /dev/null +++ b/Test/Case/View/Helper/CalendarUrlHelper/GetCalendarDailyUrlTest.php @@ -0,0 +1,27 @@ +beforeRender('viewFile'); + $url = $calendarUrl->getCalendarDailyUrl(2000, 3, 10); + + $expected = '/calendars/calendars/index?frame_id=10&style=daily&tab=list&year=2000&month=3&day=10'; + self::assertSame($expected, $url); + } +} \ No newline at end of file diff --git a/View/Helper/CalendarUrlHelper.php b/View/Helper/CalendarUrlHelper.php index cb39c17..34580af 100644 --- a/View/Helper/CalendarUrlHelper.php +++ b/View/Helper/CalendarUrlHelper.php @@ -31,6 +31,30 @@ class CalendarUrlHelper extends AppHelper { 'Calendars.CalendarCommon', ); +/** + * @var string + */ + private $__dailyBaseUrl; + + + public function beforeRender($viewFile) { + $this->__dailyBaseUrl = $this->getCalendarUrl(array( + 'plugin' => 'calendars', + 'controller' => 'calendars', + 'action' => 'index', + 'block_id' => '', + 'frame_id' => Current::read('Frame.id'), + '?' => array( + 'style' => 'daily', + 'tab' => 'list', + //'year' => $year, + //'month' => $month, + //'day' => $day, + ) + )); + parent::beforeRender($viewFile); + } + /** * makePlanShowUrl * @@ -131,21 +155,13 @@ public function makeEditUrlWithTime($year, $month, $day, $hour, $vars) { * @return string URL */ public function getCalendarDailyUrl($year, $month, $day) { - $url = $this->getCalendarUrl(array( - 'plugin' => 'calendars', - 'controller' => 'calendars', - 'action' => 'index', - 'block_id' => '', - 'frame_id' => Current::read('Frame.id'), - '?' => array( - 'style' => 'daily', - 'tab' => 'list', - 'year' => $year, - 'month' => $month, - 'day' => $day, - ) - )); - return $url; + return $this->__dailyBaseUrl . '&' . http_build_query( + [ + 'year' => $year, + 'month' => $month, + 'day' => $day, + ] + ); } /** From 373e2cb7b3c779a2dcbdf97a2ec7a28e8bc8e8e1 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Fri, 1 Oct 2021 09:57:12 +0900 Subject: [PATCH 13/28] =?UTF-8?q?style:=20=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E8=BF=BD=E5=8A=A0=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GetCalendarDailyUrlTest.php | 11 ++++++++- View/Helper/CalendarUrlHelper.php | 24 ++++++++++++++----- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/Test/Case/View/Helper/CalendarUrlHelper/GetCalendarDailyUrlTest.php b/Test/Case/View/Helper/CalendarUrlHelper/GetCalendarDailyUrlTest.php index 1071127..d950fbf 100644 --- a/Test/Case/View/Helper/CalendarUrlHelper/GetCalendarDailyUrlTest.php +++ b/Test/Case/View/Helper/CalendarUrlHelper/GetCalendarDailyUrlTest.php @@ -14,8 +14,17 @@ App::uses('View', 'View'); App::uses('NetCommonsUrl', 'NetCommons.Utility'); +/** + * CalendarUrlHelper::getCalendarDailyUrlテスト + */ class CalendarUrlHelperGetCalendarDailyUrlTest extends CakeTestCase { - public function testTest(){ + +/** + * testTest + * + * @return void + */ + public function testTest() { $calendarUrl = new CalendarUrlHelper(new View()); Current::write('Frame.id', '10'); $calendarUrl->beforeRender('viewFile'); diff --git a/View/Helper/CalendarUrlHelper.php b/View/Helper/CalendarUrlHelper.php index 34580af..7a7e7fa 100644 --- a/View/Helper/CalendarUrlHelper.php +++ b/View/Helper/CalendarUrlHelper.php @@ -32,12 +32,27 @@ class CalendarUrlHelper extends AppHelper { ); /** - * @var string + * @var string daily へのリンクから年月日クエリを除いたURL */ private $__dailyBaseUrl; - +/** + * beforeRender + * + * @param string $viewFile view file + * @return void + */ public function beforeRender($viewFile) { + $this->__setupDailyBaseUrl(); + parent::beforeRender($viewFile); + } + +/** + * setupDailyBaseUrl + * + * @return void + */ + private function __setupDailyBaseUrl() { $this->__dailyBaseUrl = $this->getCalendarUrl(array( 'plugin' => 'calendars', 'controller' => 'calendars', @@ -47,12 +62,8 @@ public function beforeRender($viewFile) { '?' => array( 'style' => 'daily', 'tab' => 'list', - //'year' => $year, - //'month' => $month, - //'day' => $day, ) )); - parent::beforeRender($viewFile); } /** @@ -115,6 +126,7 @@ public function makeEditUrl($year, $month, $day, $vars) { $url = $this->getCalendarUrlAsArray($options); return $url; } + /** * makeEditUrlWithTime * From 34f2a1ad376eec0cafa2346426a93d0afe856686 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 11 Feb 2022 18:24:05 +0900 Subject: [PATCH 14/28] change: Version number to 3.3.5 --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index a0891f5..fa7adc7 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.3.4 +3.3.5 From 4b155f39acf68ae90cb2f1b739c6db1a8ad2d6d8 Mon Sep 17 00:00:00 2001 From: Rika Fujiwara Date: Mon, 24 Oct 2022 11:50:05 +0900 Subject: [PATCH 15/28] refs: https://github.com/NetCommons3/NetCommons3/issues/1699 --- Model/CalendarPermission.php | 46 ++++++++++++++++++++------ Test/Fixture/RolesRoom4testFixture.php | 3 ++ 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/Model/CalendarPermission.php b/Model/CalendarPermission.php index 1d685f2..08b466a 100644 --- a/Model/CalendarPermission.php +++ b/Model/CalendarPermission.php @@ -263,8 +263,10 @@ protected function _setPermission(&$roomBlocks, $readableRoom) { 'block_permission_editable', 'mail_editable'); $roomIds = []; + $blockKeys = []; foreach ($roomBlocks as $roomBlock) { $roomIds[] = $roomBlock['Room']['id']; + $blockKeys[] = $roomBlock['Block']['key']; } $result = $this->DefaultRolePermission->find('all', array( 'recursive' => -1, @@ -319,7 +321,8 @@ protected function _setPermission(&$roomBlocks, $readableRoom) { ), 'conditions' => array( 'RolesRoom.room_id' => $roomIds, - 'RolesRoom.role_key' => array_keys($roleKeys) + 'RolesRoom.role_key' => array_keys($roleKeys), + 'BlockRolePermission.block_key' => $blockKeys ), 'order' => array( 'RolesRoom.room_id asc', @@ -327,6 +330,11 @@ protected function _setPermission(&$roomBlocks, $readableRoom) { ) ); $tmpPermissions = $this->RolesRoom->find('all', $conditions); + $allTmpPermissions = $this->RolesRoom->find('all', ['recursive' => -1]); + $allRoleRoomIds = []; + foreach ($allTmpPermissions as $allPerm) { + $allRoleRoomIds[$allPerm['RolesRoom']['room_id']][$allPerm['RolesRoom']['role_key']] = $allPerm['RolesRoom']['id']; + } $basePermissions = array(); foreach ($tmpPermissions as $perm) { $tmpRoomId = $perm['RolesRoom']['room_id']; @@ -341,15 +349,33 @@ protected function _setPermission(&$roomBlocks, $readableRoom) { $permissions[$permName] = array(); foreach ($roleData as $roleKey => $default) { $permissions[$permName][$roleKey] = $default; - $permissions[$permName][$roleKey]['value'] = Hash::get($basePermissions[$roomId], - $roleKey . '.' . $permName . '.BlockRolePermission.value', - Hash::get($basePermissions[$roomId], - $roleKey . '.' . $permName . '.RoomRolePermission.value', $default['value']) - ); - $permissions[$permName][$roleKey]['roles_room_id'] = Hash::get( - $basePermissions[$roomId], $roleKey . '.' . $permName . '.RolesRoom.roles_room_id'); - $permissions[$permName][$roleKey]['id'] = Hash::get( - $basePermissions[$roomId], $roleKey . '.' . $permName . '.BlockRolePermission.id'); + + // + // すでにblock_role_permissionにカレンダー用の定義レコードがあればそれを使う + // + if (isset($basePermissions[$roomId])) { + $permissions[$permName][$roleKey]['value'] = Hash::get($basePermissions[$roomId], + $roleKey . '.' . $permName . '.BlockRolePermission.value', + Hash::get($basePermissions[$roomId], + $roleKey . '.' . $permName . '.RoomRolePermission.value', $default['value']) + ); + $permissions[$permName][$roleKey]['roles_room_id'] = Hash::get( + $basePermissions[$roomId], $roleKey . '.' . $permName . '.RolesRoom.roles_room_id'); + $permissions[$permName][$roleKey]['id'] = Hash::get( + $basePermissions[$roomId], $roleKey . '.' . $permName . '.BlockRolePermission.id'); + } else { + // + // まだないときはデフォルト値を持ってきて + // id = falseで新しいレコードを作成する準備 + // + // しかし、基準のRolesRoomsテーブルに定義がないようなのは + // おかしなデータのはずなので処理対象のデータにしないようにする + if (isset($allRoleRoomIds[$roomId][$roleKey])) { + $permissions[$permName][$roleKey]['value'] = $default['value']; + $permissions[$permName][$roleKey]['roles_room_id'] = $allRoleRoomIds[$roomId][$roleKey]; + $permissions[$permName][$roleKey]['id'] = false; + } + } } } if ($permissions) { diff --git a/Test/Fixture/RolesRoom4testFixture.php b/Test/Fixture/RolesRoom4testFixture.php index fccae67..6eb020c 100644 --- a/Test/Fixture/RolesRoom4testFixture.php +++ b/Test/Fixture/RolesRoom4testFixture.php @@ -62,6 +62,9 @@ class RolesRoom4testFixture extends RolesRoomFixture { //コミュニティスペース array('id' => '15', 'room_id' => '4', 'role_key' => 'room_administrator'), array('id' => '16', 'room_id' => '4', 'role_key' => 'general_user'), + array('id' => '17', 'room_id' => '4', 'role_key' => 'chief_editor'), + array('id' => '18', 'room_id' => '4', 'role_key' => 'editor'), + array('id' => '19', 'room_id' => '4', 'role_key' => 'visitor'), ); } From 041746376386bc3d0ce146cb45ef424171101758 Mon Sep 17 00:00:00 2001 From: Rika Fujiwara Date: Mon, 24 Oct 2022 13:26:10 +0900 Subject: [PATCH 16/28] =?UTF-8?q?change:=20test:=20github=20actions?= =?UTF-8?q?=E3=81=AE=E3=82=A8=E3=83=A9=E3=83=BC=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1477ea2..4cb29e8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -48,6 +48,9 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Fix up git URLs + run: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig + - name: environment run: | echo "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}" @@ -58,7 +61,7 @@ jobs: - name: docker-compose install run: | - curl -L https://github.com/docker/compose/releases/download/1.11.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose + curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose chmod +x ~/docker-compose sudo mv ~/docker-compose /usr/local/bin/docker-compose docker-compose --version From 7db4b850f9929f073c64c9eb7244b12fa726b74c Mon Sep 17 00:00:00 2001 From: Rika Fujiwara Date: Mon, 24 Oct 2022 13:48:30 +0900 Subject: [PATCH 17/28] style: fix phpcs --- Model/CalendarPermission.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Model/CalendarPermission.php b/Model/CalendarPermission.php index 08b466a..176f9e8 100644 --- a/Model/CalendarPermission.php +++ b/Model/CalendarPermission.php @@ -333,7 +333,9 @@ protected function _setPermission(&$roomBlocks, $readableRoom) { $allTmpPermissions = $this->RolesRoom->find('all', ['recursive' => -1]); $allRoleRoomIds = []; foreach ($allTmpPermissions as $allPerm) { - $allRoleRoomIds[$allPerm['RolesRoom']['room_id']][$allPerm['RolesRoom']['role_key']] = $allPerm['RolesRoom']['id']; + $roleRoomId = $allPerm['RolesRoom']['room_id']; + $roleRoomRoleKey = $allPerm['RolesRoom']['role_key']; + $allRoleRoomIds[$roleRoomId][$roleRoomRoleKey] = $allPerm['RolesRoom']['id']; } $basePermissions = array(); foreach ($tmpPermissions as $perm) { From d172e8d11fb83673e10f024b27fcd7dd64192428 Mon Sep 17 00:00:00 2001 From: Rika Fujiwara Date: Mon, 24 Oct 2022 14:35:49 +0900 Subject: [PATCH 18/28] style: fix phpmd --- Model/CalendarPermission.php | 64 ++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/Model/CalendarPermission.php b/Model/CalendarPermission.php index 176f9e8..f245234 100644 --- a/Model/CalendarPermission.php +++ b/Model/CalendarPermission.php @@ -330,13 +330,7 @@ protected function _setPermission(&$roomBlocks, $readableRoom) { ) ); $tmpPermissions = $this->RolesRoom->find('all', $conditions); - $allTmpPermissions = $this->RolesRoom->find('all', ['recursive' => -1]); - $allRoleRoomIds = []; - foreach ($allTmpPermissions as $allPerm) { - $roleRoomId = $allPerm['RolesRoom']['room_id']; - $roleRoomRoleKey = $allPerm['RolesRoom']['role_key']; - $allRoleRoomIds[$roleRoomId][$roleRoomRoleKey] = $allPerm['RolesRoom']['id']; - } + $basePermissions = array(); foreach ($tmpPermissions as $perm) { $tmpRoomId = $perm['RolesRoom']['room_id']; @@ -354,30 +348,20 @@ protected function _setPermission(&$roomBlocks, $readableRoom) { // // すでにblock_role_permissionにカレンダー用の定義レコードがあればそれを使う + // まだないときはデフォルト値を持ってきて + // id = falseで新しいレコードを作成する準備 // - if (isset($basePermissions[$roomId])) { - $permissions[$permName][$roleKey]['value'] = Hash::get($basePermissions[$roomId], - $roleKey . '.' . $permName . '.BlockRolePermission.value', - Hash::get($basePermissions[$roomId], - $roleKey . '.' . $permName . '.RoomRolePermission.value', $default['value']) + $permissions[$permName][$roleKey]['value'] = Hash::get($basePermissions, + $roomId . '.' . $roleKey . '.' . $permName . '.BlockRolePermission.value', + $default['value'] ); - $permissions[$permName][$roleKey]['roles_room_id'] = Hash::get( - $basePermissions[$roomId], $roleKey . '.' . $permName . '.RolesRoom.roles_room_id'); - $permissions[$permName][$roleKey]['id'] = Hash::get( - $basePermissions[$roomId], $roleKey . '.' . $permName . '.BlockRolePermission.id'); - } else { - // - // まだないときはデフォルト値を持ってきて - // id = falseで新しいレコードを作成する準備 - // - // しかし、基準のRolesRoomsテーブルに定義がないようなのは - // おかしなデータのはずなので処理対象のデータにしないようにする - if (isset($allRoleRoomIds[$roomId][$roleKey])) { - $permissions[$permName][$roleKey]['value'] = $default['value']; - $permissions[$permName][$roleKey]['roles_room_id'] = $allRoleRoomIds[$roomId][$roleKey]; - $permissions[$permName][$roleKey]['id'] = false; - } - } + $permissions[$permName][$roleKey]['roles_room_id'] = Hash::get($basePermissions, + $roomId . '.' . $roleKey . '.' . $permName . '.RolesRoom.roles_room_id', + $this->__getRoleRoomId($roomId, $roleKey) + ); + $permissions[$permName][$roleKey]['id'] = Hash::get($basePermissions, + $roomId . '.' . $roleKey . '.' . $permName . '.BlockRolePermission.id', + false); } } if ($permissions) { @@ -388,6 +372,28 @@ protected function _setPermission(&$roomBlocks, $readableRoom) { } } } +/** + * __getRoleRoomId + * + * RoleRoomに定義されていているidを返す + * + * @param int $roomId ルームID + * @param string $roleKey 役割名 + * @return array + */ + private function __getRoleRoomId($roomId, $roleKey) { + $roleRoom = $this->RolesRoom->find('first', [ + 'conditions' => [ + 'room_id' => $roomId, + 'role_key' => $roleKey + ], + 'recursive' => -1 + ]); + if (!$roleRoom) { + return false; + } + return $roleRoom['RolesRoom']['id']; + } /** * _setBlockSetting * From 6d4e5ac5a19c6f1d87176dc6037423c2d1b70316 Mon Sep 17 00:00:00 2001 From: Rika Fujiwara Date: Mon, 24 Oct 2022 15:07:14 +0900 Subject: [PATCH 19/28] style: fix phpmd --- Model/CalendarPermission.php | 56 ++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/Model/CalendarPermission.php b/Model/CalendarPermission.php index f245234..1be00a0 100644 --- a/Model/CalendarPermission.php +++ b/Model/CalendarPermission.php @@ -254,6 +254,7 @@ protected function _getCalendarConditions($readableRoomIds) { * * 速度改善の修正に伴って発生したため抑制 * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ protected function _setPermission(&$roomBlocks, $readableRoom) { $perms = array( @@ -329,8 +330,8 @@ protected function _setPermission(&$roomBlocks, $readableRoom) { 'RolesRoom.id asc', ) ); - $tmpPermissions = $this->RolesRoom->find('all', $conditions); + $tmpPermissions = $this->RolesRoom->find('all', $conditions); $basePermissions = array(); foreach ($tmpPermissions as $perm) { $tmpRoomId = $perm['RolesRoom']['room_id']; @@ -338,12 +339,22 @@ protected function _setPermission(&$roomBlocks, $readableRoom) { $tmpPerm = $perm['RoomRolePermission']['permission']; $basePermissions[$tmpRoomId][$tmpRoleKey][$tmpPerm] = $perm; } + + $allRoleRoomIds = $this->__getRoleRoomIds($roomIds); foreach ($roomBlocks as &$roomBlock) { $roomId = $roomBlock['Room']['id']; $permissions = array(); foreach ($defValue as $permName => $roleData) { $permissions[$permName] = array(); foreach ($roleData as $roleKey => $default) { + + // もしも大本定義のRolesRoomに基本定義がないような + // room_id, role_keyの組み合わせが来た場合は、 + // block_role_permissionの作りようがないので、スルーします + // + if (! isset($allRoleRoomIds[$roomId][$roleKey])) { + continue; + } $permissions[$permName][$roleKey] = $default; // @@ -352,16 +363,16 @@ protected function _setPermission(&$roomBlocks, $readableRoom) { // id = falseで新しいレコードを作成する準備 // $permissions[$permName][$roleKey]['value'] = Hash::get($basePermissions, - $roomId . '.' . $roleKey . '.' . $permName . '.BlockRolePermission.value', - $default['value'] - ); - $permissions[$permName][$roleKey]['roles_room_id'] = Hash::get($basePermissions, - $roomId . '.' . $roleKey . '.' . $permName . '.RolesRoom.roles_room_id', - $this->__getRoleRoomId($roomId, $roleKey) - ); - $permissions[$permName][$roleKey]['id'] = Hash::get($basePermissions, - $roomId . '.' . $roleKey . '.' . $permName . '.BlockRolePermission.id', - false); + $roomId . '.' . $roleKey . '.' . $permName . '.BlockRolePermission.value', + $default['value'] + ); + $permissions[$permName][$roleKey]['roles_room_id'] = Hash::get($basePermissions, + $roomId . '.' . $roleKey . '.' . $permName . '.RolesRoom.roles_room_id', + $allRoleRoomIds[$roomId][$roleKey] + ); + $permissions[$permName][$roleKey]['id'] = Hash::get($basePermissions, + $roomId . '.' . $roleKey . '.' . $permName . '.BlockRolePermission.id', + false); } } if ($permissions) { @@ -373,26 +384,27 @@ protected function _setPermission(&$roomBlocks, $readableRoom) { } } /** - * __getRoleRoomId + * __getRoleRoomIds * * RoleRoomに定義されていているidを返す * - * @param int $roomId ルームID - * @param string $roleKey 役割名 + * @param array $roomIds ルームID * @return array */ - private function __getRoleRoomId($roomId, $roleKey) { - $roleRoom = $this->RolesRoom->find('first', [ + private function __getRoleRoomIds($roomIds) { + $allRoleRoomPerms = $this->RolesRoom->find('all', [ 'conditions' => [ - 'room_id' => $roomId, - 'role_key' => $roleKey + 'room_id' => $roomIds ], - 'recursive' => -1 + 'recursive' => -1, ]); - if (!$roleRoom) { - return false; + $allRoleRoomIds = []; + foreach ($allRoleRoomPerms as $roleRoomPerm) { + $roomId = $roleRoomPerm['RolesRoom']['room_id']; + $roleKey = $roleRoomPerm['RolesRoom']['role_key']; + $allRoleRoomIds[$roomId][$roleKey] = $roleRoomPerm['RolesRoom']['id']; } - return $roleRoom['RolesRoom']['id']; + return $allRoleRoomIds; } /** * _setBlockSetting From 6a754768421c747e1119f41159a2b5dfa39da1b0 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 24 Feb 2023 13:33:54 +0900 Subject: [PATCH 20/28] =?UTF-8?q?test:=20Github=20Action=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4cb29e8..7cfa881 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -44,12 +44,13 @@ jobs: MYSQL_VERSION: ${{ matrix.mysql }} MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: cakephp_test + COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 - name: Fix up git URLs - run: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig + run: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig - name: environment run: | From 3357ca65e226399499333b0c6b7e26e2993f37ab Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sat, 25 Feb 2023 21:27:22 +0900 Subject: [PATCH 21/28] change: Version number to 3.3.6 --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index fa7adc7..9c25013 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.3.5 +3.3.6 From dde50c5ddd631cce6ddd0c509d35bdc38b639ae6 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Wed, 5 Jul 2023 10:38:58 +0900 Subject: [PATCH 22/28] =?UTF-8?q?fix:=20=E3=83=A1=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=A7=E3=83=AB=E3=83=BC=E3=83=A0=E3=81=AE?= =?UTF-8?q?=E9=81=B8=E6=8A=9E=E3=81=8C=E5=8B=95=E4=BD=9C=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20refs=20https://github.com/NetComm?= =?UTF-8?q?ons3/Calendars/commit/703f1068ad7ad55adda0010322433387840ff0e7#?= =?UTF-8?q?diff-c94a8afd68cf523b9db149fd27516e62b61c3020f8e429673151511d0d?= =?UTF-8?q?81b074?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/CalendarMailSettings/edit.ctp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/View/CalendarMailSettings/edit.ctp b/View/CalendarMailSettings/edit.ctp index 3e84770..f3cdde4 100644 --- a/View/CalendarMailSettings/edit.ctp +++ b/View/CalendarMailSettings/edit.ctp @@ -35,7 +35,7 @@ $urlParams = array( $name) : ?> > NetCommonsHtml->link($name, - $urlParams + ['?' => ['room' => $key]] + array_merge_recursive($urlParams, ['?' => ['room' => $key]]) ); ?> From 74d3b0ed9c86bb8c0cf14842e05b57366158dd47 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Fri, 7 Jul 2023 17:00:36 +0900 Subject: [PATCH 23/28] fix: tests.yml --- .github/workflows/tests.yml | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7cfa881..7e11233 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ name: tests jobs: setup: name: setup - runs-on: ubuntu-18.04 + runs-on: ubuntulatest steps: - name: Slack Notification on Start uses: rtCamp/action-slack-notify@v2.2.0 @@ -28,7 +28,7 @@ jobs: tests: name: tests needs: setup - runs-on: ubuntu-18.04 + runs-on: ubuntulatest strategy: matrix: php: [ '7.1', '7.2', '7.3', '7.4' ] @@ -92,46 +92,53 @@ jobs: docker-compose exec -T nc3app bash /opt/scripts/app-build.sh - name: phpcs (PHP CodeSniffer) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpcs.sh - name: phpmd (PHP Mess Detector) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpmd.sh - name: phpcpd (PHP Copy/Paste Detector) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpcpd.sh - name: gjslint (JavaScript Style Check) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/gjslint.sh - name: phpdoc (PHP Documentor) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpdoc.sh - name: phpunit (PHP UnitTest) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpunit.sh sudo -s chmod a+w -R ${NC3_BUILD_DIR}/build - - name: push coveralls - env: - COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COVERALLS_FLAG_NAME: ${{ matrix.php }} - run: | - cd ${NC3_BUILD_DIR} - ls -la ${NC3_BUILD_DIR} - vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v +# - name: push coveralls +# env: +# COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# COVERALLS_FLAG_NAME: ${{ matrix.php }} +# run: | +# cd ${NC3_BUILD_DIR} +# ls -la ${NC3_BUILD_DIR} +# vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v - name: docker-compose remove + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose rm -f @@ -148,7 +155,7 @@ jobs: teardown: name: teardown - runs-on: ubuntu-18.04 + runs-on: ubuntulatest needs: tests steps: # テスト成功時はこちらのステップが実行される From 9a72bb804dd2ca4ab6315b97a813c21f455876f3 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Fri, 7 Jul 2023 17:14:14 +0900 Subject: [PATCH 24/28] fix: tests.yml --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7e11233..91735a8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ name: tests jobs: setup: name: setup - runs-on: ubuntulatest + runs-on: ubuntu-latest steps: - name: Slack Notification on Start uses: rtCamp/action-slack-notify@v2.2.0 @@ -28,7 +28,7 @@ jobs: tests: name: tests needs: setup - runs-on: ubuntulatest + runs-on: ubuntu-latest strategy: matrix: php: [ '7.1', '7.2', '7.3', '7.4' ] @@ -155,7 +155,7 @@ jobs: teardown: name: teardown - runs-on: ubuntulatest + runs-on: ubuntu-latest needs: tests steps: # テスト成功時はこちらのステップが実行される From c806a54fa0da9e92228e7075b937be9b6a7e6bc9 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Thu, 5 Oct 2023 16:40:48 +0900 Subject: [PATCH 25/28] =?UTF-8?q?test:=20github=20action=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 91735a8..eb2068b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,6 +19,7 @@ jobs: steps: - name: Slack Notification on Start uses: rtCamp/action-slack-notify@v2.2.0 + if: env.SLACK_WEBHOOK != '' env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} SLACK_CHANNEL: notify-nc3-tests @@ -128,14 +129,14 @@ jobs: docker-compose exec -T nc3app bash /opt/scripts/phpunit.sh sudo -s chmod a+w -R ${NC3_BUILD_DIR}/build -# - name: push coveralls -# env: -# COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# COVERALLS_FLAG_NAME: ${{ matrix.php }} -# run: | -# cd ${NC3_BUILD_DIR} -# ls -la ${NC3_BUILD_DIR} -# vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v +# - name: push coveralls +# env: +# COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# COVERALLS_FLAG_NAME: ${{ matrix.php }} +# run: | +# cd ${NC3_BUILD_DIR} +# ls -la ${NC3_BUILD_DIR} +# vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v - name: docker-compose remove if: always() @@ -146,7 +147,7 @@ jobs: # テスト失敗時はこちらのステップが実行される - name: Slack Notification on Failure uses: rtCamp/action-slack-notify@v2.2.0 - if: failure() + if: env.SLACK_WEBHOOK != '' && failure() env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} SLACK_CHANNEL: notify-nc3-tests @@ -160,8 +161,8 @@ jobs: steps: # テスト成功時はこちらのステップが実行される - name: Slack Notification on Success - if: success() uses: rtCamp/action-slack-notify@v2.2.0 + if: env.SLACK_WEBHOOK != '' && success() env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} SLACK_CHANNEL: notify-nc3-tests From 3f584bd33886c8a6a4006efcecc05ac880301e33 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Mon, 9 Oct 2023 15:43:48 +0900 Subject: [PATCH 26/28] change: Version number to 3.3.7 --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 9c25013..86fb650 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.3.6 +3.3.7 From 2f814110f8f63688ac140abdb6241785dc845b03 Mon Sep 17 00:00:00 2001 From: "G01\\fj2532ir" Date: Tue, 27 May 2025 09:55:47 +0900 Subject: [PATCH 27/28] =?UTF-8?q?fix:=E4=BA=88=E7=B4=84=E3=81=8C=E4=BA=8C?= =?UTF-8?q?=E9=87=8D=E3=81=AB=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=ABCalendarEvent.id=E3=81=A7?= =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=83=88=E3=81=97=E3=81=A6=E5=8F=96=E5=BE=97?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=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/CalendarsAppController.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Controller/CalendarsAppController.php b/Controller/CalendarsAppController.php index 5fcd1c3..1db9ca7 100644 --- a/Controller/CalendarsAppController.php +++ b/Controller/CalendarsAppController.php @@ -236,13 +236,20 @@ protected function _setCalendarCommonVars($vars) { $order = array( 'TrackableCreator' . '.handlename', 'CalendarEvent' . '.dtstart', + 'CalendarEvent' . '.id', ); } else { //時間順 - $order = array('CalendarEvent' . '.dtstart'); + $order = array( + 'CalendarEvent' . '.dtstart', + 'CalendarEvent' . '.id', + ); } } else { //$order = array('CalendarEvent' . '.start_date'); - $order = array('CalendarEvent' . '.dtstart'); + $order = array( + 'CalendarEvent' . '.dtstart', + 'CalendarEvent' . '.id', + ); } //room_idとspace_idの対応表を載せておく。 From 587b89dd9a59191f7e1ee17f72f2521afc7c2068 Mon Sep 17 00:00:00 2001 From: "G01\\fj2532ir" Date: Tue, 27 May 2025 14:23:11 +0900 Subject: [PATCH 28/28] =?UTF-8?q?fix:=E3=82=A4=E3=83=B3=E3=83=87=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/CalendarsAppController.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Controller/CalendarsAppController.php b/Controller/CalendarsAppController.php index 1db9ca7..be7f08f 100644 --- a/Controller/CalendarsAppController.php +++ b/Controller/CalendarsAppController.php @@ -234,22 +234,22 @@ protected function _setCalendarCommonVars($vars) { //$order = array('TrackableCreator' . '.username'); //$order = array('TrackableCreator' . '.handlename'); $order = array( - 'TrackableCreator' . '.handlename', - 'CalendarEvent' . '.dtstart', - 'CalendarEvent' . '.id', - ); + 'TrackableCreator' . '.handlename', + 'CalendarEvent' . '.dtstart', + 'CalendarEvent' . '.id', + ); } else { //時間順 $order = array( - 'CalendarEvent' . '.dtstart', - 'CalendarEvent' . '.id', - ); + 'CalendarEvent' . '.dtstart', + 'CalendarEvent' . '.id', + ); } } else { //$order = array('CalendarEvent' . '.start_date'); $order = array( - 'CalendarEvent' . '.dtstart', - 'CalendarEvent' . '.id', - ); + 'CalendarEvent' . '.dtstart', + 'CalendarEvent' . '.id', + ); } //room_idとspace_idの対応表を載せておく。