public_flag_default設定の削除

[trpgtools-onweb/cake-frame.git] / app / models / profile.php

diff --git a/app/models/profile.php b/app/models/profile.php
index 74fdcd6..f389e7a 100644 (file)
--- a/app/models/profile.php
+++ b/app/models/profile.php
@@ -1,7 +1,8 @@
 <?php
-/**
+/*
  * PHP version 5
  *
+ * @copyright Copyright 2010, Cake. (http://trpgtools-onweb.sourceforge.jp/)
  * @category Model
  * @package  TRPG Data Bank
  * @version  beta
@@ -9,6 +10,7 @@
  * @license  http://www.opensource.org/licenses/mit-license.php The MIT License
  * @link     http://trpgtools-onweb.sourceforge.jp/
  */
+
 class Profile extends AppModel {
 
        var $name = 'Profile';
@@ -25,8 +27,8 @@ class Profile extends AppModel {
        );
 
        var $fields = array(
-               'add' => array('system_id', 'name', 'key_name', 'profile_type', 'required', 'show_list', 'search', 'public_flag_default', 'sort_order'),
-               'edit' => array('name', 'key_name', 'profile_type', 'required', 'show_list', 'search', 'public_flag_default', 'sort_order'),
+               'add' => array('system_id', 'name', 'key_name', 'profile_type', 'required', 'show_list', 'search', 'sort_order'),
+               'edit' => array('name', 'key_name', 'profile_type', 'required', 'show_list', 'search', 'sort_order'),
                'edit_all' => array('required', 'show_list', 'search','sort_order'),
                'escape' => array(
                        'name' => array(
@@ -84,12 +86,6 @@ class Profile extends AppModel {
                                'allowEmpty' => true,
                        ),
                ),
-               'public_flag_default' => array(
-                       'publicFlag' => array(
-                               'rule' => 'publicFlagDefault',
-                               'allowEmpty' => true,
-                       ),
-               ),
                'sort_order' => array(
                        'numeric' => array(
                                'rule' => array('numeric'),
@@ -156,6 +152,19 @@ class Profile extends AppModel {
                        'finderQuery' => '',
                        'deleteQuery' => '',
                        'insertQuery' => ''
+               ),
+               'DefaultProfile' => array(
+                       'className' => 'DefaultProfile',
+                       'foreignKey' => 'profile_id',
+                       'dependent' => true,
+                       'conditions' => '',
+                       'fields' => '',
+                       'order' => '', // Using filesortの原因
+                       'limit' => '',
+                       'offset' => '',
+                       'exclusive' => '',
+                       'finderQuery' => '',
+                       'counterQuery' => ''
                )
        );
 
@@ -189,16 +198,6 @@ class Profile extends AppModel {
                }
        }
 
-       function publicFlagDefault($data) 
-       {
-               if (isset($data["public_flag_default"]) && in_array($data["public_flag_default"], $this->public_flag)) {
-                       return true;
-               } else {
-                       return false;
-               }
-       }
-
-
        /* コールバックメソッド */
        function beforeSave($options = array())
        {