Skip to content

Merge from master #176

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 master #176

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
1251518
fix: 多言語のサイトで、片方の言語ページを削除する機能にバグがありエラーとなる。ただ、当機能はほぼ使われていないためこの機能自体を消す…
s-nakajima Jan 10, 2023
dab7929
Merge pull request #175 from NetCommons3/bugfix/single_language_page
s-nakajima Jan 10, 2023
f2c7174
test: Github Actionエラー修正
s-nakajima Feb 24, 2023
df14699
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
31 changes: 16 additions & 15 deletions Controller/PagesEditController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,21 +660,22 @@ private function __hasDeletePage() {
* @return bool
*/
private function __hasDeleteThisPage() {
$activeLangs = $this->Language->getLanguages();
if (! Current::read('Space.is_m17n') && count($activeLangs) <= 1) {
return false;
}

$hasDeletePage = $this->__hasDeletePage();
if (! $hasDeletePage) {
return false;
}

$activeLangIds = Hash::extract($activeLangs, '{n}.Language.id');

$pageIdsM17n = $this->Page->getPageIdsWithM17n(Current::read('Page.id'));

return (bool)array_diff($activeLangIds, Hash::get($pageIdsM17n, Current::read('Page.id'), []));
return false;
//$activeLangs = $this->Language->getLanguages();
//if (! Current::read('Space.is_m17n') && count($activeLangs) <= 1) {
// return false;
//}
//
//$hasDeletePage = $this->__hasDeletePage();
//if (! $hasDeletePage) {
// return false;
//}
//
//$activeLangIds = Hash::extract($activeLangs, '{n}.Language.id');
//
//$pageIdsM17n = $this->Page->getPageIdsWithM17n(Current::read('Page.id'));
//
//return (bool)array_diff($activeLangIds, Hash::get($pageIdsM17n, Current::read('Page.id'), []));
}

}
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