svnno****@sourc*****
svnno****@sourc*****
2012年 6月 3日 (日) 22:25:00 JST
Revision: 113
http://sourceforge.jp/projects/smartupload/scm/svn/commits/113
Author: hryksbt
Date: 2012-06-03 22:25:00 +0900 (Sun, 03 Jun 2012)
Log Message:
-----------
Modelを一通り用意
Modified Paths:
--------------
trunk/src/Engine/app/models/content.php
trunk/src/Engine/app/models/credit_campany.php
trunk/src/Engine/app/models/user.php
trunk/src/Engine/app/models/user_modify.php
trunk/src/Engine/app/tests/fixtures/content_fixture.php
trunk/src/Engine/app/tests/fixtures/credit_campany_fixture.php
trunk/src/Engine/app/tests/fixtures/user_modify_fixture.php
-------------- next part --------------
Modified: trunk/src/Engine/app/models/content.php
===================================================================
--- trunk/src/Engine/app/models/content.php 2012-06-01 15:21:58 UTC (rev 112)
+++ trunk/src/Engine/app/models/content.php 2012-06-03 13:25:00 UTC (rev 113)
@@ -3,7 +3,7 @@
var $name = 'Content';
var $displayField = 'id';
var $validate = array(
- 'content_name' => array(
+ 'id' => array(
'notempty' => array(
'rule' => array('notempty'),
//'message' => 'Your custom message here',
@@ -12,6 +12,16 @@
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
+ 'numeric' => array(
+ 'rule' => array('numeric'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
+ ),
+ 'content_name' => array(
'alphanumeric' => array(
'rule' => array('alphanumeric'),
//'message' => 'Your custom message here',
@@ -19,7 +29,23 @@
//'required' => false,
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
- ),
+ ),
+ 'maxlength' => array(
+ 'rule' => array('maxlength'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
+ 'notempty' => array(
+ 'rule' => array('notempty'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
),
'category_id' => array(
'numeric' => array(
@@ -40,6 +66,14 @@
),
),
'explain' => array(
+ 'maxlength' => array(
+ 'rule' => array('maxlength'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
'notempty' => array(
'rule' => array('notempty'),
//'message' => 'Your custom message here',
@@ -48,6 +82,14 @@
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
+ 'alphanumeric' => array(
+ 'rule' => array('alphanumeric'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
),
'user_id' => array(
'numeric' => array(
@@ -104,8 +146,8 @@
),
),
'delete_flag' => array(
- 'boolean' => array(
- 'rule' => array('boolean'),
+ 'between' => array(
+ 'rule' => array('between'),
//'message' => 'Your custom message here',
//'allowEmpty' => false,
//'required' => false,
@@ -148,14 +190,6 @@
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
- 'notempty' => array(
- 'rule' => array('notempty'),
- //'message' => 'Your custom message here',
- //'allowEmpty' => false,
- //'required' => false,
- //'last' => false, // Stop validation after this rule
- //'on' => 'create', // Limit validation to 'create' or 'update' operations
- ),
),
);
//The Associations below have been created with all possible keys, those that are not needed can be removed
Modified: trunk/src/Engine/app/models/credit_campany.php
===================================================================
--- trunk/src/Engine/app/models/credit_campany.php 2012-06-01 15:21:58 UTC (rev 112)
+++ trunk/src/Engine/app/models/credit_campany.php 2012-06-03 13:25:00 UTC (rev 113)
@@ -3,7 +3,15 @@
var $name = 'CreditCampany';
var $displayField = 'id';
var $validate = array(
- 'campany_name' => array(
+ 'id' => array(
+ 'numeric' => array(
+ 'rule' => array('numeric'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
'notempty' => array(
'rule' => array('notempty'),
//'message' => 'Your custom message here',
@@ -12,6 +20,16 @@
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
+ ),
+ 'campany_name' => array(
+ 'maxlength' => array(
+ 'rule' => array('maxlength'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
'alphanumeric' => array(
'rule' => array('alphanumeric'),
//'message' => 'Your custom message here',
@@ -20,6 +38,14 @@
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
+ 'notempty' => array(
+ 'rule' => array('notempty'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
),
'delete_flag' => array(
'boolean' => array(
@@ -40,16 +66,16 @@
),
),
'regist_date' => array(
- 'date' => array(
- 'rule' => array('date'),
+ 'notempty' => array(
+ 'rule' => array('notempty'),
//'message' => 'Your custom message here',
//'allowEmpty' => false,
//'required' => false,
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
- 'notempty' => array(
- 'rule' => array('notempty'),
+ 'date' => array(
+ 'rule' => array('date'),
//'message' => 'Your custom message here',
//'allowEmpty' => false,
//'required' => false,
Modified: trunk/src/Engine/app/models/user.php
===================================================================
--- trunk/src/Engine/app/models/user.php 2012-06-01 15:21:58 UTC (rev 112)
+++ trunk/src/Engine/app/models/user.php 2012-06-03 13:25:00 UTC (rev 113)
@@ -38,6 +38,14 @@
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
+ 'maxlength' => array(
+ 'rule' => array('maxlength'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
),
'password' => array(
'alphanumeric' => array(
@@ -56,8 +64,24 @@
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
+ 'maxlength' => array(
+ 'rule' => array('maxlength'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
),
'name' => array(
+ 'alphanumeric' => array(
+ 'rule' => array('alphanumeric'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
'notempty' => array(
'rule' => array('notempty'),
//'message' => 'Your custom message here',
@@ -66,6 +90,14 @@
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
+ 'maxlength' => array(
+ 'rule' => array('maxlength'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
),
'address' => array(
'notempty' => array(
@@ -76,6 +108,22 @@
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
+ 'maxlength' => array(
+ 'rule' => array('maxlength'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
+ 'notempty' => array(
+ 'rule' => array('notempty'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
),
'country_id' => array(
'numeric' => array(
@@ -112,6 +160,14 @@
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
+ 'maxlength' => array(
+ 'rule' => array('maxlength'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
),
'delete_flag' => array(
'boolean' => array(
@@ -122,6 +178,14 @@
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
+ 'notempty' => array(
+ 'rule' => array('notempty'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
),
'accounting_flag' => array(
'boolean' => array(
@@ -182,8 +246,8 @@
),
),
'bank_account_number' => array(
- 'cc' => array(
- 'rule' => array('cc'),
+ 'numeric' => array(
+ 'rule' => array('numeric'),
//'message' => 'Your custom message here',
//'allowEmpty' => false,
//'required' => false,
@@ -210,8 +274,8 @@
),
),
'modify_date' => array(
- 'cc' => array(
- 'rule' => array('cc'),
+ 'date' => array(
+ 'rule' => array('date'),
//'message' => 'Your custom message here',
//'allowEmpty' => false,
//'required' => false,
@@ -220,8 +284,8 @@
),
),
'application_date' => array(
- 'cc' => array(
- 'rule' => array('cc'),
+ 'date' => array(
+ 'rule' => array('date'),
//'message' => 'Your custom message here',
//'allowEmpty' => false,
//'required' => false,
Modified: trunk/src/Engine/app/models/user_modify.php
===================================================================
--- trunk/src/Engine/app/models/user_modify.php 2012-06-01 15:21:58 UTC (rev 112)
+++ trunk/src/Engine/app/models/user_modify.php 2012-06-03 13:25:00 UTC (rev 113)
@@ -3,7 +3,33 @@
var $name = 'UserModify';
var $displayField = 'name';
var $validate = array(
+ 'id' => array(
+ 'notempty' => array(
+ 'rule' => array('notempty'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
+ 'numeric' => array(
+ 'rule' => array('numeric'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
+ ),
'user_id' => array(
+ 'notempty' => array(
+ 'rule' => array('notempty'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
'numeric' => array(
'rule' => array('numeric'),
//'message' => 'Your custom message here',
@@ -13,6 +39,24 @@
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
),
+ 'password' => array(
+ 'alphanumeric' => array(
+ 'rule' => array('alphanumeric'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
+ 'maxlength' => array(
+ 'rule' => array('maxlength'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
+ ),
'name' => array(
'alphanumeric' => array(
'rule' => array('alphanumeric'),
@@ -22,7 +66,33 @@
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
+ 'maxlength' => array(
+ 'rule' => array('maxlength'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
),
+ 'address' => array(
+ 'maxlength' => array(
+ 'rule' => array('maxlength'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
+ 'alphanumeric' => array(
+ 'rule' => array('alphanumeric'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
+ ),
'country_id' => array(
'numeric' => array(
'rule' => array('numeric'),
@@ -42,6 +112,14 @@
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
+ 'maxlength' => array(
+ 'rule' => array('maxlength'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
),
'credit_number' => array(
'cc' => array(
@@ -73,15 +151,43 @@
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
),
+ 'bank_id' => array(
+ 'numeric' => array(
+ 'rule' => array('numeric'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
+ ),
+ 'bank_account_number' => array(
+ 'numeric' => array(
+ 'rule' => array('numeric'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
+ ),
'URL' => array(
- 'url' => array(
- 'rule' => array('url'),
+ 'maxlength' => array(
+ 'rule' => array('maxlength'),
//'message' => 'Your custom message here',
//'allowEmpty' => false,
//'required' => false,
//'last' => false, // Stop validation after this rule
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
+ 'alphanumeric' => array(
+ 'rule' => array('alphanumeric'),
+ //'message' => 'Your custom message here',
+ //'allowEmpty' => false,
+ //'required' => false,
+ //'last' => false, // Stop validation after this rule
+ //'on' => 'create', // Limit validation to 'create' or 'update' operations
+ ),
),
'apprication_date' => array(
'date' => array(
@@ -117,6 +223,13 @@
'conditions' => '',
'fields' => '',
'order' => ''
+ ),
+ 'Bank' => array(
+ 'className' => 'Bank',
+ 'foreignKey' => 'bank_id',
+ 'conditions' => '',
+ 'fields' => '',
+ 'order' => ''
)
);
}
Modified: trunk/src/Engine/app/tests/fixtures/content_fixture.php
===================================================================
--- trunk/src/Engine/app/tests/fixtures/content_fixture.php 2012-06-01 15:21:58 UTC (rev 112)
+++ trunk/src/Engine/app/tests/fixtures/content_fixture.php 2012-06-03 13:25:00 UTC (rev 113)
@@ -1,5 +1,5 @@
<?php
-/* Content Fixture generated on: 2012-06-01 17:08:24 : 1338563304 */
+/* Content Fixture generated on: 2012-06-03 15:14:37 : 1338729277 */
class ContentFixture extends CakeTestFixture {
var $name = 'Content';
@@ -28,8 +28,8 @@
'data_size' => 1,
'download_count' => 1,
'delete_flag' => 1,
- 'regist_date' => '2012-06-01 17:08:24',
- 'modify_date' => '2012-06-01 17:08:24'
+ 'regist_date' => '2012-06-03 15:14:37',
+ 'modify_date' => '2012-06-03 15:14:37'
),
);
}
Modified: trunk/src/Engine/app/tests/fixtures/credit_campany_fixture.php
===================================================================
--- trunk/src/Engine/app/tests/fixtures/credit_campany_fixture.php 2012-06-01 15:21:58 UTC (rev 112)
+++ trunk/src/Engine/app/tests/fixtures/credit_campany_fixture.php 2012-06-03 13:25:00 UTC (rev 113)
@@ -1,5 +1,5 @@
<?php
-/* CreditCampany Fixture generated on: 2012-06-01 17:18:19 : 1338563899 */
+/* CreditCampany Fixture generated on: 2012-06-03 15:02:40 : 1338728560 */
class CreditCampanyFixture extends CakeTestFixture {
var $name = 'CreditCampany';
@@ -18,8 +18,8 @@
'id' => 1,
'campany_name' => 'Lorem ipsum dolor sit amet',
'delete_flag' => 1,
- 'regist_date' => '2012-06-01 17:18:19',
- 'modify_date' => '2012-06-01 17:18:19'
+ 'regist_date' => '2012-06-03 15:02:40',
+ 'modify_date' => '2012-06-03 15:02:40'
),
);
}
Modified: trunk/src/Engine/app/tests/fixtures/user_modify_fixture.php
===================================================================
--- trunk/src/Engine/app/tests/fixtures/user_modify_fixture.php 2012-06-01 15:21:58 UTC (rev 112)
+++ trunk/src/Engine/app/tests/fixtures/user_modify_fixture.php 2012-06-03 13:25:00 UTC (rev 113)
@@ -1,5 +1,5 @@
<?php
-/* UserModify Fixture generated on: 2012-05-29 19:03:03 : 1338310983 */
+/* UserModify Fixture generated on: 2012-06-03 15:28:00 : 1338730080 */
class UserModifyFixture extends CakeTestFixture {
var $name = 'UserModify';
@@ -14,6 +14,8 @@
'credit_number' => array('type' => 'integer', 'null' => true, 'default' => NULL),
'credit_expire' => array('type' => 'datetime', 'null' => true, 'default' => NULL),
'credit_id' => array('type' => 'integer', 'null' => true, 'default' => NULL),
+ 'bank_id' => array('type' => 'integer', 'null' => true, 'default' => NULL),
+ 'bank_account_number' => array('type' => 'integer', 'null' => true, 'default' => NULL),
'URL' => array('type' => 'string', 'null' => true, 'default' => NULL, 'length' => 128, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
'apprication_date' => array('type' => 'datetime', 'null' => false, 'default' => NULL),
'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)),
@@ -30,10 +32,12 @@
'country_id' => 1,
'mail_address' => 'Lorem ipsum dolor sit amet',
'credit_number' => 1,
- 'credit_expire' => '2012-05-29 19:03:03',
+ 'credit_expire' => '2012-06-03 15:28:00',
'credit_id' => 1,
+ 'bank_id' => 1,
+ 'bank_account_number' => 1,
'URL' => 'Lorem ipsum dolor sit amet',
- 'apprication_date' => '2012-05-29 19:03:03'
+ 'apprication_date' => '2012-06-03 15:28:00'
),
);
}