X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Felements%2Fedit.html;h=829b77615f50b1317567de5579cb07061b681e96;hp=3e6bd5bec702b2beacaa28989567653d49a5b223;hb=793956b8a0c19d7d39103e94235b0ca13f0f3e84;hpb=c2e126583354b58ef54ffa7f580b115b8eed1dd3 diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html index 3e6bd5bec..829b77615 100644 --- a/httemplate/edit/elements/edit.html +++ b/httemplate/edit/elements/edit.html @@ -7,7 +7,7 @@ Example: # (preferred, will be pluralized automatically) 'name' => #name for the record # (deprecated, will be pluralized simplistically) - 'table' => + 'table' => #database table #? 'primary_key' => #required when the dbdef doesn't know...??? 'labels' => { @@ -108,13 +108,24 @@ Example: # overrides default popurl(1)."process/$table.html" 'post_url' => popurl(1).'process/something', + # optional link to delete this object; primary key will be appended + 'delete_url' => $p.'misc/delete-something.html?', + #we're in a popup (no title/menu/searchboxes) 'popup' => 1, + #if you need to access the submit button + 'submit_id' => 'mysubmitbuttonid', + #we're embedded (rows only: no header at all, no html_init, no error # display, no
, no hidden fields for table name or primary key, no # display of primary key, no submit button, no html_foot, no footer) 'embed' => $object, #need to pass the object + 'tablenum' => 4, #need to specify a table number when using multiple + #embedded edits on a page (and m2 stuff) + + #don't show the primary key label and value + 'no_pkey_display' => 1, ### # HTML callbacks @@ -124,6 +135,11 @@ Example: 'html_init' => '', #after the header/menubar + 'form_init' => '', #after html_init, error and the opening , but + #before any other form contents + + 'html_table_class' => '', #HTML 'html_table_bottom' => '', @@ -190,7 +206,7 @@ Example: &> - +% % unless ( $opt{embed} ) { % % my $title = $opt{action}. ' '. ( $opt{name} || $opt{'name_singular'} ); @@ -207,13 +223,13 @@ Example: % "View all $items" => $viewall_url, % ); % } - - <% include('/elements/header'. ( $opt{popup} ? '-popup' : '' ). '.html', +% +<% include('/elements/header'. ( $opt{popup} ? '-popup' : '' ). '.html', $title, include( '/elements/menubar.html', @menubar ), $opt{'body_etc'}, ) - %> +%> <% defined($opt{'html_init'}) ? ( ref($opt{'html_init'}) @@ -227,6 +243,7 @@ Example: % my $url = $opt{'post_url'} || popurl(1)."process/$table.html"; +% $js_form_validate = { 'edit_topform' => { 'name' => 'edit_topform' } }; - + - - <% ( $opt{labels} && exists $opt{labels}->{$pkey} ) - ? $opt{labels}->{$pkey} - : $pkey + <% defined($opt{'form_init'}) + ? ( ref($opt{'form_init'}) + ? &{$opt{'form_init'}}() + : $opt{'form_init'} + ) + : '' %> - - #<% ( !$clone && $object->$pkey() ) || "(NEW)" %> + +% unless ( $opt{'no_pkey_display'} ) { + + + <% ( $opt{labels} && exists $opt{labels}->{$pkey} ) + ? $opt{labels}->{$pkey} + : $pkey + %> + + #<% ( !$clone && $object->$pkey() ) || "(NEW)" %> + +% } % } -% my $tablenum = 0; -
+% my $tablenum = $opt{'tablenum'} || 0; +
% my $g_row = 0; % my @g_row_stack = (); @@ -282,6 +313,7 @@ Example: % #text and derivitives % 'size' => $f->{'size'}, % 'maxlength' => $f->{'maxlength'}, +% 'prefix' => $f->{'prefix'}, % 'postfix' => $f->{'postfix'}, % % #textarea @@ -303,33 +335,47 @@ Example: % 'disable_empty' => $f->{'disable_empty'}, % #select-reason % 'reason_class' => $f->{'reason_class'}, +% #select-agent +% 'viewall_right' => $f->{'viewall_right'}, % % #selectlayers % 'layer_fields' => $f->{'layer_fields'}, % 'layer_values' => $layer_values, % 'html_between' => $f->{'html_between'}, % -% #umm. for select-agent_types at least +% #umm. for select-agent_type at least % 'disabled' => $f->{'disabled'}, % 'fixed' => $f->{'fixed'}, +% 'label_callback'=> $f->{'label_callback'}, +% 'element_etc' => $f->{'element_etc'}, +% +% #for select-ticketing_queueid at least +% 'post_options' => $f->{'post_options'}, % % #any? % 'colspan' => $f->{'colspan'}, % 'required' => $f->{'required'}, +% +% #contact +% 'custnum' => $f->{'custnum'}, +% 'prospectnum' => $f->{'prospectnum'}, +% % ); % % $include_common{$_} = $f->{$_} foreach grep exists($f->{$_}), % qw( js_only html_only select_only layers_only cell_style ),#selectlayers,? % qw( empty_label ), # select-* -% qw( value_col compare_sub ), # select-table +% qw( value_col compare_sub order_by addl_from ), # select-table % qw( table name_col ), #(select,checkboxes)-table % qw( target_table link_table ), #checkboxes-table % qw( hashref agent_virt agent_null agent_null_right ),#*-table % qw( formatted_value ), #fixed % qw( country ), #select-country -% qw( width height ), #htmlarea -% qw( alt_format ), #select-cust_location +% qw( width height config ), #htmlarea +% qw( is_optional alt_format ), #select-cust_location % qw( classnum ), # select-inventory_item +% qw( aligned ), # columnstart +% qw( debug ), # select-table % ; % % #select-table @@ -353,6 +399,8 @@ Example: % % my $layer_prefix_on = ''; % +% my $submitid = $opt{submit_id} ? $opt{submit_id} : ''; +% % my $include_sub = sub { % my %opt = @_; % @@ -365,11 +413,19 @@ Example: % $include_common{'layer_prefix'} = "$field$fieldnum." % if $layer_prefix_on; % +% ## set conditionname field values for validation. +% if ($field eq 'conditionname') { +% my $validate_field = $field . $fieldnum . '.after_event.run_delay'; +% $js_form_validate->{edit_topform}->{validate_fields}{$validate_field} = 'digits: true'; +% $js_form_validate->{edit_topform}->{error_message}{$validate_field} = 'Please only enter numbers here.'; +% } +% % my @include = % ( "/elements/$include.html", % 'field' => "$field$fieldnum", % 'id' => "$field$fieldnum", #separate? % 'label_id' => $field."_label$fieldnum", #don't want field0_label0... +% 'submit_id' => $submitid, % %include_common, % %opt, % ); @@ -382,6 +438,7 @@ Example: % 'value' => $opt{curr_value}, % 'label' => $label, % 'noinit' => $f->{noinit}, +% 'required' => $f->{'required'}, % } % ); % } @@ -456,12 +513,15 @@ Example: % } % foreach my $name_obj ( @existing ) { % +% my $m2_label = $f->{'m2_label'}; +% $m2_label = &{ $f->{'m2_label_callback'} }($name_obj) if $f->{'m2_label_callback'}; +% % my $ex_label = ' '. ($f->{'m2_label'} || $field ). ' '; +% '> '. ($m2_label || $field ). ' '; % % if ( $f->{'layer_values_callback'} ) { % my %switches = ( 'mode' => $mode ); @@ -518,7 +578,7 @@ Example: % if ( $f->{curr_value_callback} ) { % $curr_value = &{ $f->{curr_value_callback} }( $cgi, $object, $field ), % } else { -% $curr_value = $object->$field(); +% $curr_value = $object->$field() if $field; % } % $curr_value = &{ $opt{'value_callback'} }( $f->{'field'}, $curr_value ) % if $opt{'value_callback'} && $mode ne 'error'; @@ -578,7 +638,7 @@ Example: // only spawn if we're the last element... return if not - var field_regex = /(\d+)(_[a-z_]+)?$/; + var field_regex = /(\d+)(_[a-z_0-9]+)?$/; var match = field_regex.exec(what.name); if ( !match ) { alert(what.name + " didn't match for " + what); @@ -588,6 +648,15 @@ Example: return; } +% if ( exists( $f->{'js_spawn_test'} ) ) { + // XXX check a passed-in hook here and optionall return + if ( <% $f->{'js_spawn_test'} %> ) { + // then go ahead and spawn + } else { + return; + } +% } + // change the label on the last entry & add a remove button var prev_label = document.getElementById('<% $field %>_label' + <%$field%>_fieldnum ); prev_label.innerHTML = ' <% $f->{'m2_label'} || $field %>'; @@ -607,7 +676,7 @@ Example: var newrow = <% include(@layer_opt, html_only=>1) |js_string %>; % #until the rest have html/js_only -% if ( $type eq 'selectlayers' || $type =~ /^select-cgp_rule_/ ) { +% if ( ($type eq 'selectlayers') || ($type eq 'selectlayersx') || ($type =~ /^select-cgp_rule_/) || ($type eq 'contact') ) { var newfunc = <% include(@layer_opt, js_only=>1) |js_string %>; % } else { var newfunc = ''; @@ -633,7 +702,7 @@ Example: var row = table.insertRow(<%$field%>_rownum++); - var label_cell = document.createElement('TD'); + var label_cell = document.createElement('TH'); label_cell.id = '<% $field %>_label' + <%$field%>_fieldnum; @@ -650,7 +719,7 @@ Example: widget_cell.style.borderTop = "1px solid black"; widget_cell.style.paddingTop = "3px"; - widget_cell.colSpan = "<% $f->{'colspan'} || 1 %>" + widget_cell.colSpan = "<% $f->{'colspan'} || 1 %>"; widget_cell.innerHTML = newrow; @@ -752,6 +821,18 @@ Example: : $opt{'html_bottom'} %> +% ## set extra field values for validation. ie price plan fields +% my $extra_fields_to_validate = $opt{'extra_fields_validate'}; +% my %validate_error_messages = ( +% 'digits: true' => 'Please only enter numbers here.', +% 'email: true' => 'Please enter a valid email here.', +% ); +% foreach my $extra_fields (keys %$extra_fields_to_validate) { +% my $validate_type = $extra_fields_to_validate->{$extra_fields}; +% $js_form_validate->{edit_topform}->{validate_fields}{$extra_fields} = $validate_type; +% $js_form_validate->{edit_topform}->{error_message}{$extra_fields} = $validate_error_messages{$validate_type}; +% } + % unless ($opt{'embed'}) {
@@ -764,6 +845,23 @@ Example: : "Add ". ($opt{'name'} || $opt{'name_singular'}) %>" > +% if ( $opt{'delete_url'} and $object->get($pkey) ) { +% my $delete_msg = 'Delete this '. +% ($opt{'name_singular'} || $opt{'name'}); +% my $delete_url = $opt{'delete_url'}; +% $delete_url .= '?' unless $delete_url =~ /\?/; +% $delete_url .= $object->get($pkey); + + +% } % } @@ -773,13 +871,18 @@ Example: : $opt{'html_foot'} %> - <% include("/elements/footer.html") %> +% my %footerdata = ( +% 'formvalidation' => $js_form_validate, +% ); + + <% include("/elements/footer.html", %footerdata) %> % } <%init> my(%opt) = @_; +my $conf = new FS::Conf; my $curuser = $FS::CurrentUser::CurrentUser; #false laziness w/process.html @@ -789,7 +892,13 @@ my $pkey = dbdef->table($table)->primary_key; #? $opt{'primary_key'} || my $fields = $opt{'fields'} #|| [ grep { $_ ne $pkey } dbdef->table($table)->columns ]; || [ grep { $_ ne $pkey } fields($table) ]; -#my @actualfields = map { ref($_) ? $_->{'field'} : $_ } @$fields; +my @actualfields = map { ref($_) ? $_->{'field'} : $_ } @$fields; + +push @actualfields, $pkey; +push @actualfields, 'ip_addr' if $table eq 'svc_broadband'; +push @actualfields, 'usergroup' if ($table eq 'svc_broadband' && $conf->exists('svc_broadband-radius')); + +my $js_form_validate = {}; my( $mode, $object); my $clone = ''; @@ -830,7 +939,7 @@ if ( $opt{'embed'} ) { $mode = 'error'; $object = $class->new( { - map { $_ => scalar($cgi->param($_)) } fields($table) + map { $_ => scalar($cgi->param($_)) } @actualfields }); &{$opt{'error_callback'}}( $cgi, $object, $fields, \%opt )