Skip to content

Merge from mater #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s-nakajima merged 4 commits into from
Apr 28, 2023
Merged

Merge from mater #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af746dc
fix: ルームの作成時に、参加者の選択画面で役割を変更した後で基本設定に戻って、「すべての会員をデフォルトで参加させる」にチェックを入れ…
s-nakajima Feb 13, 2023
5ab22fd
Merge pull request #203 from NetCommons3/bugfix/change_default_partic…
s-nakajima Feb 13, 2023
2909b70
test: Github Actionエラー修正
s-nakajima Feb 24, 2023
8f612cb
change: Version number to 3.3.6
s-nakajima Feb 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ jobs:
MYSQL_VERSION: ${{ matrix.mysql }}
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: cakephp_test
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v2
Expand Down
5 changes: 5 additions & 0 deletions Controller/RoomAddController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,11 @@ public function basic() {
//他言語が入力されていない場合、Currentの言語データをセット
$this->SwitchLanguage->setM17nRequestValue();

$defaultParticipation = $this->request->data['Room']['default_participation'] ?? null;
if ($this->Session->read('RoomAdd.Room.default_participation') !== $defaultParticipation) {
$this->Session->delete('RoomsRolesUsers');
}

//登録処理
$this->request->data['Room']['in_draft'] = true;
$room = $this->Room->saveRoom($this->request->data);
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.5
3.3.6