euromark 12 年之前
父节点
当前提交
df562b107a
共有 6 个文件被更改,包括 11 次插入3 次删除
  1. 1 1
      Console/Command/IndexShell.php
  2. 6 0
      Controller/MyController.php
  3. 1 0
      Lib/DiffLib.php
  4. 1 1
      Lib/RandomLib.php
  5. 1 1
      Model/MyModel.php
  6. 1 0
      View/Helper/FormExtHelper.php

+ 1 - 1
Console/Command/IndexShell.php

@@ -167,7 +167,7 @@ class IndexShell extends AppShell {
 		if (!$useDbConfig) {
 			return array();
 		}
-		require_once(CONFIGS . 'database.php');
+		require_once CONFIGS . 'database.php';
 		$connections = get_class_vars('DATABASE_CONFIG');
 		if (!isset($connections[$useDbConfig])) {
 			return array();

+ 6 - 0
Controller/MyController.php

@@ -7,6 +7,12 @@ App::uses('Controller', 'Controller');
 class MyController extends Controller {
 
 	/**
+	 * @var array
+	 * @link https://github.com/cakephp/cakephp/pull/857
+	 */
+	public $paginate = array();
+
+	/**
 	 * Fix for asset compress to not run into fatal error loops
 	 */
 	public function __construct($request = null, $response = null) {

+ 1 - 0
Lib/DiffLib.php

@@ -109,6 +109,7 @@ class DiffLib {
 		}
 		return false;
 	}
+
 	/**
 	 * Compare function
 	 * Compares two strings/arrays using the specified method and renderer

+ 1 - 1
Lib/RandomLib.php

@@ -51,7 +51,6 @@ class RandomLib {
 		//NOT IMPORTANT
 	}
 
-	//TODO
 	/**
 	 * 1950-01-01 - 2050-12-31
 	 */
@@ -80,6 +79,7 @@ class RandomLib {
 	/**
 	 * 00:00:00 - 23:59:59
 	 */
+
 	public static function time($min = null, $max = null, $formatReturn = null) {
 
 		$res = 0;

+ 1 - 1
Model/MyModel.php

@@ -732,6 +732,7 @@ class MyModel extends Model {
 	'processed' => true
 	)
 	*/
+
 	/**
 	 * Core-fix for multiple sort orders
 	 *
@@ -1271,7 +1272,6 @@ class MyModel extends Model {
 	public function validateDateRange($data, $options = array()) {
 	}
 
-	//TODO
 	/**
 	 * Validation of Time Fields (>= minTime && <= maxTime)
 	 * @param options

+ 1 - 0
View/Helper/FormExtHelper.php

@@ -511,6 +511,7 @@ class FormExtHelper extends FormHelper {
 
 	//TODO: use http://trentrichardson.com/examples/timepicker/
 	// or maybe: http://pttimeselect.sourceforge.net/example/index.html (if 24 hour + select dropdowns are supported)
+
 	/**
 	 * quicklinks: clear, today, ...
 	 */