diff options
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/Mason.pm | 2 | ||||
| -rw-r--r-- | FS/FS/Schema.pm | 18 | ||||
| -rw-r--r-- | FS/FS/cgp_rule_action.pm | 2 | ||||
| -rw-r--r-- | FS/FS/cgp_rule_condition.pm | 4 |
4 files changed, 14 insertions, 12 deletions
diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm index 108a7ff27..c96a9807e 100644 --- a/FS/FS/Mason.pm +++ b/FS/FS/Mason.pm @@ -224,6 +224,8 @@ if ( -e $addl_handler_use_file ) { use FS::svc_pbx; use FS::svc_mailinglist; use FS::cgp_rule; + use FS::cgp_rule_condition; + use FS::cgp_rule_action; # Sammath Naur if ( $FS::Mason::addl_handler_use ) { diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index c13cec985..78f3e44a9 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -1636,11 +1636,11 @@ sub tables_hashref { 'cgp_rule_condition' => { 'columns' => [ - 'ruleconditionnum', 'serial', '', '', '', '', - 'condition', 'varchar', '', $char_d, '', '', - 'op', 'varchar', '', $char_d, '', '', - 'params', 'varchar', '', 255, '', '', - 'rulenum', 'int', '', '', '', '', + 'ruleconditionnum', 'serial', '', '', '', '', + 'condition', 'varchar', '', $char_d, '', '', + 'op', 'varchar', 'NULL', $char_d, '', '', + 'params', 'varchar', 'NULL', 255, '', '', + 'rulenum', 'int', '', '', '', '', ], 'primary_key' => 'ruleconditionnum', 'unique' => [], @@ -1649,10 +1649,10 @@ sub tables_hashref { 'cgp_rule_action' => { 'columns' => [ - 'ruleactionnum', 'serial', '', '', '', '', - 'action', 'varchar', '', $char_d, '', '', - 'params', 'varchar', '', 255, '', '', - 'rulenum', 'int', '', '', '', '', + 'ruleactionnum', 'serial', '', '', '', '', + 'action', 'varchar', '', $char_d, '', '', + 'params', 'varchar', 'NULL', 255, '', '', + 'rulenum', 'int', '', '', '', '', ], 'primary_key' => 'ruleactionnum', 'unique' => [], diff --git a/FS/FS/cgp_rule_action.pm b/FS/FS/cgp_rule_action.pm index 6dfd42427..170ab58db 100644 --- a/FS/FS/cgp_rule_action.pm +++ b/FS/FS/cgp_rule_action.pm @@ -111,7 +111,7 @@ sub check { my $error = $self->ut_numbern('ruleactionnum') || $self->ut_text('action') - || $self->ut_text('params') + || $self->ut_textn('params') || $self->ut_foreign_key('rulenum', 'cgp_rule', 'rulenum') ; return $error if $error; diff --git a/FS/FS/cgp_rule_condition.pm b/FS/FS/cgp_rule_condition.pm index f91b3e6f6..cfb671063 100644 --- a/FS/FS/cgp_rule_condition.pm +++ b/FS/FS/cgp_rule_condition.pm @@ -115,8 +115,8 @@ sub check { my $error = $self->ut_numbern('ruleconditionnum') || $self->ut_text('condition') - || $self->ut_text('op') - || $self->ut_text('params') + || $self->ut_textn('op') + || $self->ut_textn('params') || $self->ut_foreign_key('rulenum', 'cgp_rule', 'rulenum') ; return $error if $error; |