Version 1.1.0 リリース

Author: momofff

Config/setting.php

@@ -18,8 +18,9 @@
         'adminsName' => [
             'admins'
         ],
-        'allowedAdminAllOperation'   => TRUE,
-        'allowedAllUserGroupUploads' => FALSE,
-        'allowedAllUserGroupDblogs'  => FALSE
+        'allowedAdminAllOperation'     => TRUE,
+        'allowedAllUserGroupUploads'   => FALSE,
+        'allowedAllUserGroupDblogs'    => FALSE,
+        'allowedAllUserGroupBlogPosts' => TRUE
     ]
 ];

Event/OperationHelperEventListener.php

@@ -39,6 +39,7 @@ public function formAfterForm(CakeEvent $event)
         $View->plugin    = 'Operation';
 
         $View->BcBaser->css('Operation.admin/style');
+        $View->BcBaser->js('Operation.admin/script');
 
         switch ($event->data['id']) {
         case 'SiteAdminEditForm':

Event/OperationModelEventListener.php

@@ -94,7 +94,7 @@ public function beforeFind(CakeEvent $event)
 
         $Model     = $event->subject();
         $modelName = $Model->name;
-        if (!in_array($modelName, ['Content', 'Site', 'UploaderFile', 'Dblog'])) return TRUE;
+        if (!in_array($modelName, ['Content', 'Site', 'UploaderFile', 'Dblog', 'BlogPost'])) return TRUE;
 
         $loginUser = BcUtil::loginUser();
         $userGroup = $loginUser['UserGroup']['name'];
@@ -123,14 +123,14 @@ public function beforeFind(CakeEvent $event)
             if ($allowedUploads === TRUE) break;
 
             $event->data[0]['conditions'][] = [
-                'User.user_group_id' => $loginUser['user_group_id']
+                'User4Operation.user_group_id' => $loginUser['user_group_id']
             ];
             $event->data[0]['joins'][] = [
                 'type'  => 'LEFT',
                 'table' => 'users',
-                'alias' => 'User',
+                'alias' => 'User4Operation',
                 'conditions' => [
-                    'UploaderFile.user_id = User.id'
+                    'UploaderFile.user_id = User4Operation.id'
                 ]
             ];
             break;
@@ -143,6 +143,29 @@ public function beforeFind(CakeEvent $event)
                 'User.user_group_id' => $loginUser['user_group_id']
             ];
             break;
+
+        case 'BlogPost':
+            $allowedBlogPosts = Configure::read('Operation.admin.allowedAllUserGroupBlogPosts');
+            if ($allowedBlogPosts === TRUE) break;
+
+            if (!empty($event->data[0]['fields'])
+                && ($event->data[0]['fields'] == 'MAX(BlogPost.no) AS max'
+                || (is_array($event->data[0]['fields']) && in_array('MAX(BlogPost.no) AS max', $event->data[0]['fields'])))) {
+                break;
+            }
+
+            $event->data[0]['conditions'][] = [
+                'User4Operation.user_group_id' => $loginUser['user_group_id']
+            ];
+            $event->data[0]['joins'][] = [
+                'type'  => 'LEFT',
+                'table' => 'users',
+                'alias' => 'User4Operation',
+                'conditions' => [
+                    'BlogPost.user_id = User4Operation.id'
+                ]
+            ];
+            break;
         }
 
         return TRUE;

README.md

@@ -19,9 +19,10 @@ $config['Operation'] = [
         'adminsName' => [
             'admins'
         ],
-        'allowedAdminAllOperation'   => TRUE,
-        'allowedAllUserGroupUploads' => FALSE,
-        'allowedAllUserGroupDblogs'  => FALSE
+        'allowedAdminAllOperation'     => TRUE,
+        'allowedAllUserGroupUploads'   => FALSE,
+        'allowedAllUserGroupDblogs'    => FALSE,
+        'allowedAllUserGroupBlogPosts' => TRUE
     ]
 ];
 ```
@@ -44,4 +45,10 @@ $config['Operation'] = [
 ダッシュボードの最近の動きに表示するログを設定します。  
 `Operation.admin.allowedAdminAllOperation` が TRUE の場合、管理者権限ユーザーグループは全アカウントのログを表示します。
 - TRUE : 全アカウントのログを表示します。
-- FALSE : 同じユーザーグループのアカウントのログのみを表示します。
+- FALSE : 同じユーザーグループのアカウントのログのみを表示します。
+
+### Operation.admin.allowedAllUserGroupBlogPosts
+ブログ記事一覧に表示するブログ記事を設定します。  
+`Operation.admin.allowedAdminAllOperation` が TRUE の場合、管理者権限ユーザーグループは全アカウントのブログ記事を表示します。
+- TRUE : 全アカウントのブログ記事を表示します。
+- FALSE : 同じユーザーグループのアカウントのブログ記事のみを表示します。

VERSION.txt

@@ -1 +1 @@
-1.0.0
+1.1.0

View/Elements/admin/sites/form.php View/Elements/admin/sites/input_operation.php

@@ -1,18 +1,15 @@
     <tr>
-      <th>
+      <th class="bca-form-table__label">
         <?php echo $this->BcForm->label('Operation.user_group', __d('baser', '管理ユーザーグループ')); ?>
       </th>
-      <td>
+      <td class="bca-form-table__input">
         <?php echo $this->BcForm->input('Operation.user_group.all', $op['all_user_group']); ?>
         <?php echo $this->BcForm->error('Operation.user_group.all'); ?>
-        <ul class="user_group_check_any">
+        <ul class="op-checkbox-group-any" data-bca-state="open">
           <?php foreach ($op['any_user_group'] as $i => $user_group) { ?>
-          <li>
-            <?php echo $this->BcForm->input($user_group['name'], $user_group['option']); ?>
-            <?php echo $this->BcForm->label($user_group['name'], $user_group['label']); ?>
-          </li>
+          <li><?php echo $this->BcForm->input($user_group['name'], $user_group['option']); ?></li>
           <?php } ?>
         </ul>
-        <?php echo $this->BcForm->error('Operationi.user_group.any'); ?>
+        <?php echo $this->BcForm->error('Operation.user_group.any'); ?>
       </td>
     </tr>

View/Helper/OperationHelper.php

@@ -62,7 +62,7 @@ public function getSiteId()
      */
     public function setCustomField()
     {
-        $Operation = ClassRegistry::init('Operation.Operation');
+        $Operation  = ClassRegistry::init('Operation.Operation');
 
         $siteId = $this->getSiteId();
         $userGroup          = $Operation->findUserGroups();
@@ -75,12 +75,12 @@ public function setCustomField()
                 [
                     'name'  => __d('baser', '全ユーザーグループ'),
                     'value' => 'ALL',
-                    'class' => 'radio_user_group_all'
+                    'class' => 'bca-radio__input'
                 ],
                 [
                     'name'  => __d('baser', '特定のユーザーグループ'),
                     'value' => 0,
-                    'class' => 'radio_user_group_any'
+                    'class' => 'bca-radio__input'
                 ]
             ]
         ];
@@ -92,19 +92,19 @@ public function setCustomField()
 
         $anyUserGroupOption = [];
         foreach ($userGroup as $userGroupId => $array) {
-            $isChecked   = (!empty($array['Operation'][$siteId])) ? 'checked' : NULL;
+            $isChecked   = (!empty($array['Operation'][$siteId]) || in_array($array['UserGroup']['name'], $adminsName) && $allowedAdminAllOperation === TRUE) ? 'checked' : NULL;
             $isDisabled  = (in_array($array['UserGroup']['name'], $adminsName) && $allowedAdminAllOperation === TRUE) ? 'disabled' : NULL;
             $anyUserGroupOption[] = [
                 'option' => [
                     'type'  => 'checkbox',
+                    'class' => 'bca-checkbox__input',
                     'value' => 1,
+                    'label' => $array['UserGroup']['title'],
                     $isChecked,
                     $isDisabled
                 ],
-                'name'   => 'Operation.user_group.'.$array['UserGroup']['id'],
-                'label'  => $array['UserGroup']['title']
+                'name'   => 'Operation.user_group.'.$array['UserGroup']['id']
             ];
-
         }
 
         $data = [
@@ -114,7 +114,7 @@ public function setCustomField()
             ]
         ];
 
-        $this->BcBaser->element('sites/form', $data);
+        $this->BcBaser->element('Operation.sites/input_operation', $data);
         return;
     } // end function setCustomField
 

webroot/css/admin/style.css

@@ -1,13 +1,14 @@
 /**
  * CustomField
  */
-ul.user_group_check_any,
-input.radio_user_group_all:checked ~ ul.user_group_check_any {
+ul.op-checkbox-group-any {
   display: none;
+  padding: 0;
 }
-input.radio_user_group_any:checked ~ ul.user_group_check_any {
+ul.op-checkbox-group-any[data-bca-state="open"] {
   display: block;
 }
-ul.user_group_check_any li {
+ul.op-checkbox-group-any li {
+  list-style: none;
   background: none;
 }

webroot/js/admin/script.js

@@ -0,0 +1,21 @@
+window.onload = function() {
+  let radios = document.getElementsByName('data[Operation][user_group][all]');
+  let checkboxGroup = document.querySelector('ul.op-checkbox-group-any');
+
+  radios.forEach(
+    radio => {
+      if (radio.checked == true) switchCheckboxGroup(radio.value);
+      radio.addEventListener('change', e => {
+        switchCheckboxGroup(e.target.value);
+      })
+    }
+  );
+
+  function switchCheckboxGroup(value) {
+    if (value == 'ALL') {
+      checkboxGroup.dataset.bcaState = '';
+    } else {
+      checkboxGroup.dataset.bcaState = 'open';
+    }
+  }
+}