From f75ac6d78dd8fe72e5ec7e38e0cf24703b45e611 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Wed, 19 Aug 2015 02:51:11 +0200 Subject: [PATCH] Fixes on models --- src/CoreFields/BooleanField.php | 2 +- src/CoreFields/CharField.php | 2 +- src/CoreFields/ChoiceField.php | 2 +- src/CoreFields/DateField.php | 2 +- src/CoreFields/DoubleField.php | 2 +- src/CoreFields/EmailField.php | 2 +- src/CoreFields/FileField.php | 2 +- src/CoreFields/ForeignKeyField.php | 2 +- src/CoreFields/ImageField.php | 2 +- src/CoreFields/IntegerField.php | 2 +- src/CoreFields/KeyField.php | 2 +- src/CoreFields/ParentField.php | 2 +- src/CoreFields/PasswordField.php | 2 +- src/CoreFields/PhangoField.php | 2 +- src/CoreFields/PrimaryField.php | 2 +- src/CoreFields/TextField.php | 2 +- src/CoreFields/TextHTMLField.php | 2 +- src/ExtraModels/UserPhangoModel.php | 1 + 18 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/CoreFields/BooleanField.php b/src/CoreFields/BooleanField.php index 8d35258..862b587 100644 --- a/src/CoreFields/BooleanField.php +++ b/src/CoreFields/BooleanField.php @@ -24,7 +24,7 @@ class BooleanField extends PhangoField { { $this->size=1; - $this->form='CoreForms::SelectForm'; + $this->form='PhangoApp\PhaModels\CoreForms::SelectForm'; } diff --git a/src/CoreFields/CharField.php b/src/CoreFields/CharField.php index 5a080be..4bb0b77 100644 --- a/src/CoreFields/CharField.php +++ b/src/CoreFields/CharField.php @@ -31,7 +31,7 @@ class CharField extends PhangoField { { $this->size=$size; - $this->form='CoreForms::TextForm'; + $this->form='PhangoApp\PhaModels\CoreForms::TextForm'; } diff --git a/src/CoreFields/ChoiceField.php b/src/CoreFields/ChoiceField.php index 764e205..f4e7952 100644 --- a/src/CoreFields/ChoiceField.php +++ b/src/CoreFields/ChoiceField.php @@ -29,7 +29,7 @@ class ChoiceField extends PhangoField { { $this->size=$size; - $this->form='CoreForms::SelectForm'; + $this->form='PhangoApp\PhaModels\CoreForms::SelectForm'; $this->type=$type; $this->arr_values=$arr_values; $this->default_value=$default_value; diff --git a/src/CoreFields/DateField.php b/src/CoreFields/DateField.php index 0c33474..157724f 100644 --- a/src/CoreFields/DateField.php +++ b/src/CoreFields/DateField.php @@ -23,7 +23,7 @@ class DateField extends PhangoField { { $this->size=$size; - $this->form='CoreForms::DateForm'; + $this->form='PhangoApp\PhaModels\CoreForms::DateForm'; } diff --git a/src/CoreFields/DoubleField.php b/src/CoreFields/DoubleField.php index 35f54d6..57ba60c 100644 --- a/src/CoreFields/DoubleField.php +++ b/src/CoreFields/DoubleField.php @@ -22,7 +22,7 @@ class DoubleField extends PhangoField { { $this->size=$size; - $this->form='CoreForms::TextForm'; + $this->form='PhangoApp\PhaModels\CoreForms::TextForm'; } diff --git a/src/CoreFields/EmailField.php b/src/CoreFields/EmailField.php index cb4ff27..938e56a 100644 --- a/src/CoreFields/EmailField.php +++ b/src/CoreFields/EmailField.php @@ -12,7 +12,7 @@ class EmailField extends PhangoField { public $size=200; public $value=""; public $label=""; - public $form="CoreForms::TextForm"; + public $form="PhangoApp\PhaModels\CoreForms::TextForm"; public $class=""; public $required=0; public $quot_open='\''; diff --git a/src/CoreFields/FileField.php b/src/CoreFields/FileField.php index b4fc13e..9709a76 100644 --- a/src/CoreFields/FileField.php +++ b/src/CoreFields/FileField.php @@ -12,7 +12,7 @@ class FileField extends PhangoField { public $value=""; public $label=""; public $required=0; - public $form="CoreForms::FileForm"; + public $form="PhangoApp\PhaModels\CoreForms::FileForm"; public $name_file=""; public $path=""; public $url_path=""; diff --git a/src/CoreFields/ForeignKeyField.php b/src/CoreFields/ForeignKeyField.php index a1806af..88323c0 100644 --- a/src/CoreFields/ForeignKeyField.php +++ b/src/CoreFields/ForeignKeyField.php @@ -29,7 +29,7 @@ class ForeignKeyField extends IntegerField{ { $this->size=$size; - $this->form='CoreForms::SelectForm'; + $this->form='PhangoApp\PhaModels\CoreForms::SelectForm'; $this->related_model=&$related_model; $this->container_model=$this->related_model->name; //Fields obtained from related_model if you make a query... diff --git a/src/CoreFields/ImageField.php b/src/CoreFields/ImageField.php index e7b0a70..9d72a9b 100644 --- a/src/CoreFields/ImageField.php +++ b/src/CoreFields/ImageField.php @@ -15,7 +15,7 @@ class ImageField extends PhangoField { public $value=""; public $label=""; public $required=0; - public $form="CoreForms::ImageForm"; + public $form="PhangoApp\PhaModels\CoreForms::ImageForm"; public $name_file=""; public $path=""; public $url_path=""; diff --git a/src/CoreFields/IntegerField.php b/src/CoreFields/IntegerField.php index ef750e0..2f8b92e 100644 --- a/src/CoreFields/IntegerField.php +++ b/src/CoreFields/IntegerField.php @@ -22,7 +22,7 @@ class IntegerField extends PhangoField { { $this->size=$size; - $this->form='CoreForms::TextForm'; + $this->form='PhangoApp\PhaModels\CoreForms::TextForm'; $this->only_positive=$only_positive; $this->min_num=$min_num; $this->max_num=$max_num; diff --git a/src/CoreFields/KeyField.php b/src/CoreFields/KeyField.php index 4b0a11c..23fb6d2 100644 --- a/src/CoreFields/KeyField.php +++ b/src/CoreFields/KeyField.php @@ -26,7 +26,7 @@ class KeyField extends PhangoField { { $this->size=$size; - $this->form='CoreForms::TextForm'; + $this->form='PhangoApp\PhaModels\CoreForms::TextForm'; } diff --git a/src/CoreFields/ParentField.php b/src/CoreFields/ParentField.php index 815e741..62aea58 100644 --- a/src/CoreFields/ParentField.php +++ b/src/CoreFields/ParentField.php @@ -17,7 +17,7 @@ class ParentField extends IntegerField{ $this->parent_model=&$parent_model; $this->size=$size; - $this->form='CoreForms::SelectForm'; + $this->form='PhangoApp\PhaModels\CoreForms::SelectForm'; } diff --git a/src/CoreFields/PasswordField.php b/src/CoreFields/PasswordField.php index 5219a33..0083f50 100644 --- a/src/CoreFields/PasswordField.php +++ b/src/CoreFields/PasswordField.php @@ -18,7 +18,7 @@ class PasswordField extends CharField { { $this->size=$size; - $this->form='CoreForms::PasswordForm'; + $this->form='PhangoApp\PhaModels\CoreForms::PasswordForm'; } diff --git a/src/CoreFields/PhangoField.php b/src/CoreFields/PhangoField.php index 13b8c09..cca1810 100644 --- a/src/CoreFields/PhangoField.php +++ b/src/CoreFields/PhangoField.php @@ -87,7 +87,7 @@ class PhangoField { * Form define the function for use in forms... */ - public $form="CoreForms::TextForm"; + public $form="PhangoApp\PhaModels\CoreForms::TextForm"; /** * Array for create initial parameters for form.. diff --git a/src/CoreFields/PrimaryField.php b/src/CoreFields/PrimaryField.php index a2d7eb2..6970e1f 100644 --- a/src/CoreFields/PrimaryField.php +++ b/src/CoreFields/PrimaryField.php @@ -33,7 +33,7 @@ class PrimaryField extends PhangoField { * By default, the form used for this field is HiddenForm. */ - public $form="CoreForms::HiddenForm"; + public $form="PhangoApp\PhaModels\CoreForms::HiddenForm"; /** * Check function that convert the value on a PrimaryField value. diff --git a/src/CoreFields/TextField.php b/src/CoreFields/TextField.php index 23d4edf..62b1d4e 100644 --- a/src/CoreFields/TextField.php +++ b/src/CoreFields/TextField.php @@ -22,7 +22,7 @@ class TextField extends PhangoField { function __construct($multilang=0) { - $this->form='CoreForms::TextAreaForm'; + $this->form='PhangoApp\PhaModels\CoreForms::TextAreaForm'; $this->multilang=$multilang; } diff --git a/src/CoreFields/TextHTMLField.php b/src/CoreFields/TextHTMLField.php index 9ca4f02..1db8cec 100644 --- a/src/CoreFields/TextHTMLField.php +++ b/src/CoreFields/TextHTMLField.php @@ -25,7 +25,7 @@ class TextHTMLField extends PhangoField { function __construct($multilang=0) { - $this->form='CoreForms::TextAreaForm'; + $this->form='PhangoApp\PhaModels\CoreForms::TextAreaForm'; $this->multilang=$multilang; $this->set_safe_html_tags(); diff --git a/src/ExtraModels/UserPhangoModel.php b/src/ExtraModels/UserPhangoModel.php index a4a5623..452a3e1 100644 --- a/src/ExtraModels/UserPhangoModel.php +++ b/src/ExtraModels/UserPhangoModel.php @@ -13,6 +13,7 @@ namespace PhangoApp\PhaModels\ExtraModels; use PhangoApp\Phai18n\I18n; use PhangoApp\PhaModels\Webmodel; +use PhangoApp\PhaUtils\Utils; I18n::load_lang('users');