Skip to content

change: パブリックルームの容量制限を設定できるように変更 #64

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
RyujiAMANO merged 2 commits into from
Jun 29, 2019
Merged

change: パブリックルームの容量制限を設定できるように変更 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4704a2
change: パブリックルームの容量制限を設定できるように変更
RyujiAMANO Jun 25, 2019
4ef09d2
style: reformat code.
RyujiAMANO Jun 29, 2019
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
19 changes: 15 additions & 4 deletions Controller/SystemManagerController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,23 @@ public function edit() {
)
));

$spaces = $this->Space->cacheFindQuery('all', array(
'recursive' => -1,
'conditions' => array('id' => [Space::PRIVATE_SPACE_ID, Space::COMMUNITY_SPACE_ID]),
));
$spaces = $this->Space->cacheFindQuery(
'all',
[
'recursive' => -1,
'conditions' => [
'id' => [
Space::PRIVATE_SPACE_ID,
Space::COMMUNITY_SPACE_ID,
Space::PUBLIC_SPACE_ID
]
],
]
);

$setSpaceDisk = array(
// パブリックルームの容量
Space::PUBLIC_SPACE_ID => 'App.disk_for_public_room',
// * グループルームの容量
Space::COMMUNITY_SPACE_ID => 'App.disk_for_group_room',
// * プライベートルームの容量
Expand Down
6 changes: 6 additions & 0 deletions Locale/eng/LC_MESSAGES/system_manager.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ msgstr ""
msgid "App.default_timezone"
msgstr "Default timezone"

msgid "App.disk_for_public_room"
msgstr "Disk space for public room"

msgid "App.disk_for_public_room help"
msgstr "Set the limit of the total amount of files which can be stored in each public room."

#: SystemManager/View/Elements/SystemManager/general_form.ctp:37
msgid "App.disk_for_group_room"
msgstr "Disk space for community room"
Expand Down
6 changes: 6 additions & 0 deletions Locale/jpn/LC_MESSAGES/system_manager.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ msgstr "無制限"
msgid "App.default_timezone"
msgstr "デフォルトのタイムゾーン"

msgid "App.disk_for_public_room"
msgstr "各パブリックルームの容量"

msgid "App.disk_for_public_room help"
msgstr "各パブリックルームにアップロードできるファイルの総量を指定します。"

#: SystemManager/View/Elements/SystemManager/general_form.ctp:37
msgid "App.disk_for_group_room"
msgstr "各コミュニティの容量"
Expand Down
7 changes: 7 additions & 0 deletions View/Elements/SystemManager/general_form.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ foreach ($SiteSetting->diskSpace as $size) {
'label' => __d('system_manager', 'App.default_timezone'),
)); ?>

<?php echo $this->SystemManager->inputCommon('SiteSetting', 'App.disk_for_public_room', array(
'type' => 'select',
'options' => $diskSpace,
'label' => __d('system_manager', 'App.disk_for_public_room'),
'help' => __d('system_manager', 'App.disk_for_public_room help'),
)); ?>

<?php echo $this->SystemManager->inputCommon('SiteSetting', 'App.disk_for_group_room', array(
'type' => 'select',
'options' => $diskSpace,
Expand Down