public_flagの共通設定化と作成/編集画面でプルダウン表示

diff --git a/app/controllers/app_controller.php b/app/controllers/app_controller.php
index 66c2cd1..c06cad9 100644 (file)
--- a/app/controllers/app_controller.php
+++ b/app/controllers/app_controller.php
@@ -37,6 +37,7 @@ class AppController extends Controller
                'Html',
                'Form',
                'Javascript',
+               'Selectpublic',
                'Token'
        );
 
@@ -126,6 +127,18 @@ class AppController extends Controller
                }
 
        }
+
+       /* public_flag設定をview用にセット */
+       function set_public_flag4view()
+       {
+               $model_public_flags = $this->get_public_flag();
+
+               $this->set('public_flags', $model_public_flags);
+       }
+       function get_public_flag()
+       {
+               return $this->{$this->modelClass}->public_flag;
+       }
 }
 
 // AppControllerを携帯とPCで振り分け

diff --git a/app/controllers/characters_controller.php b/app/controllers/characters_controller.php
index e200555..91e304c 100644 (file)
--- a/app/controllers/characters_controller.php
+++ b/app/controllers/characters_controller.php
@@ -61,6 +61,8 @@ class CharactersController extends AppController {
                $systems = $this->Character->System->find('list');
                $users = $this->Character->User->find('list');
                $this->set(compact('systems', 'users'));
+
+               $this->set_public_flag4view();
        }
 
        function edit($id = null) {
@@ -82,6 +84,8 @@ class CharactersController extends AppController {
                $systems = $this->Character->System->find('list');
                $users = $this->Character->User->find('list');
                $this->set(compact('systems','users'));
+
+               $this->set_public_flag4view();
        }
 
        function delete($id = null) {

diff --git a/app/controllers/systems_controller.php b/app/controllers/systems_controller.php
index 49ea6bc..088ed72 100644 (file)
--- a/app/controllers/systems_controller.php
+++ b/app/controllers/systems_controller.php
@@ -65,6 +65,8 @@ class SystemsController extends AppController {
                                $this->Session->setFlash(__('The System could not be saved. Please, try again.', true));
                        }
                }
+
+               $this->set_public_flag4view();
        }
 
        function admin_edit($id = null) {
@@ -88,6 +90,8 @@ class SystemsController extends AppController {
 
                        $this->data['System'] = $this->_restore_html_system($this->data['System']);
                }
+
+               $this->set_public_flag4view();
        }
 
        function admin_delete($id = null) {

diff --git a/app/controllers/users_controller.php b/app/controllers/users_controller.php
index 8dc9586..4914c00 100644 (file)
--- a/app/controllers/users_controller.php
+++ b/app/controllers/users_controller.php
@@ -25,7 +25,6 @@ class UsersController extends ModuleController {
                $this->unsetData('auto', true);
 
                // 認証なしアクセス可
-               $this->AuthPlus->allow('login');
                $this->AuthPlus->allow('add'); //todo:メール認証etc
                $this->AuthPlus->allow('logout');
                $this->AuthPlus->allow('to_login');

diff --git a/app/views/characters/add.ctp b/app/views/characters/add.ctp
index 78c3852..c143cd1 100644 (file)
--- a/app/views/characters/add.ctp
+++ b/app/views/characters/add.ctp
@@ -25,7 +25,7 @@
                        'label' => __('Status', true)
                )
        );
-       echo $form->input('public_flag', array(
+       echo $selectpublic->create_publicflag_select($public_flags, 'public_flag', array(
                        'label' => __('Public Flag', true)
                )
        );

diff --git a/app/views/characters/edit.ctp b/app/views/characters/edit.ctp
index 2468025..a3e8231 100644 (file)
--- a/app/views/characters/edit.ctp
+++ b/app/views/characters/edit.ctp
@@ -24,7 +24,7 @@
                        'label' => __('Status', true)
                )
        );
-       echo $form->input('public_flag', array(
+       echo $selectpublic->create_publicflag_select($public_flags, 'public_flag', array(
                        'label' => __('Public Flag', true)
                )
        );

diff --git a/app/views/helpers/selectpublic.php b/app/views/helpers/selectpublic.php
new file mode 100644 (file)
index 0000000..cdbd289
--- /dev/null
+++ b/app/views/helpers/selectpublic.php
@@ -0,0 +1,41 @@
+<?php
+class SelectpublicHelper extends Helper {
+       var $helpers = array('Form');
+
+       var $default_public_flags = array('public_flag', 'private');
+       /**
+        * public_flagの選択プルダウン出力
+        * i18n対応
+        *
+        * @param array $public_flags
+        * @return String
+        */
+       function create_publicflag_select($public_flags = array(), $fieldName = 'public_flag', $options = array('type' => 'select')) {
+
+               if (empty($public_flags)) {
+                       $public_flags = $this->default_public_flags;
+               }
+
+               if (!isset($options['type'])) {
+                       $options['type'] = 'select';
+               }
+               if (!isset($options['options'])) {
+                       $options['options'] = array();
+               }
+
+               foreach ($public_flags as $k => $v) {
+                       if ($v == 'public') {
+                               $options['options'][$v] = __('Public', true);
+                       } elseif($v == 'private') {
+                               $options['options'][$v] = __('Private', true);
+                       } else {
+                               $options['options'][$v] = $v;
+                       }
+               }
+
+               return $this->Form->input($fieldName, $options);
+       }
+
+}
+
+

diff --git a/app/views/systems/admin_add.ctp b/app/views/systems/admin_add.ctp
index 25c0b54..cea355a 100644 (file)
--- a/app/views/systems/admin_add.ctp
+++ b/app/views/systems/admin_add.ctp
@@ -37,13 +37,8 @@
                                'selected' => true
                        )
                );
-               echo $form->input('public_flag', array(
-                               'type' => 'select',
-                               'label' => __('Public', true),
-                               'options' => array(
-                                       'public' => __('Public', true),
-                                       'private' => __('Private', true),
-                               ),
+               echo $selectpublic->create_publicflag_select($public_flags, 'public_flag', array(
+                               'label' => __('Public Flag', true),
                                'selected' => 'public',
                        )
                );

diff --git a/app/views/systems/admin_edit.ctp b/app/views/systems/admin_edit.ctp
index 7cf6488..cb0d058 100644 (file)
--- a/app/views/systems/admin_edit.ctp
+++ b/app/views/systems/admin_edit.ctp
@@ -37,14 +37,8 @@
                                'selected' => true
                        )
                );
-               echo $form->input('public_flag', array(
-                               'type' => 'select',
-                               'label' => __('Public', true),
-                               'options' => array(
-                                       'public' => __('Public', true),
-                                       'private' => __('Private', true),
-                               ),
-                               'selected' => 'public',
+               echo $selectpublic->create_publicflag_select($public_flags, 'public_flag', array(
+                               'label' => __('Public Flag', true)
                        )
                );
                echo $form->input('detail', array(