svnno****@sourc*****
svnno****@sourc*****
2012年 6月 4日 (月) 00:47:59 JST
ForkRevision: 123
http://sourceforge.jp/projects/smartupload/scm/svn/commits/123
Author: hryksbt
Date: 2012-06-04 00:47:59 +0900 (Mon, 04 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/src/Engine/app/models/branch.php
trunk/src/Engine/app/tests/fixtures/branch_fixture.php
-------------- next part --------------
Modified: trunk/src/Engine/app/models/branch.php
===================================================================
--- trunk/src/Engine/app/models/branch.php 2012-06-03 15:46:35 UTC (rev 122)
+++ trunk/src/Engine/app/models/branch.php 2012-06-03 15:47:59 UTC (rev 123)
@@ -4,16 +4,16 @@
var $displayField = 'id';
var $validate = array(
'id' => array(
- 'numeric' => array(
- 'rule' => array('numeric'),
+ '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'),
+ 'numeric' => array(
+ 'rule' => array('numeric'),
//'message' => 'Your custom message here',
//'allowEmpty' => false,
//'required' => false,
@@ -30,14 +30,6 @@
//'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',
Modified: trunk/src/Engine/app/tests/fixtures/branch_fixture.php
===================================================================
--- trunk/src/Engine/app/tests/fixtures/branch_fixture.php 2012-06-03 15:46:35 UTC (rev 122)
+++ trunk/src/Engine/app/tests/fixtures/branch_fixture.php 2012-06-03 15:47:59 UTC (rev 123)
@@ -1,12 +1,12 @@
<?php
-/* Branch Fixture generated on: 2012-06-03 17:31:15 : 1338737475 */
+/* Branch Fixture generated on: 2012-06-03 17:46:17 : 1338738377 */
class BranchFixture extends CakeTestFixture {
var $name = 'Branch';
var $fields = array(
'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'key' => 'primary'),
'branch_name' => array('type' => 'string', 'null' => false, 'default' => NULL, 'length' => 64, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
- 'delete_flag' => array('type' => 'integer', 'null' => false, 'default' => NULL),
+ 'delete_flag' => array('type' => 'boolean', 'null' => false, 'default' => NULL),
'regist_date' => array('type' => 'datetime', 'null' => false, 'default' => NULL),
'modify_date' => array('type' => 'datetime', 'null' => true, 'default' => NULL),
'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)),
@@ -18,8 +18,8 @@
'id' => 1,
'branch_name' => 'Lorem ipsum dolor sit amet',
'delete_flag' => 1,
- 'regist_date' => '2012-06-03 17:31:15',
- 'modify_date' => '2012-06-03 17:31:15'
+ 'regist_date' => '2012-06-03 17:46:17',
+ 'modify_date' => '2012-06-03 17:46:17'
),
);
}