diff --git a/copri4/main/css/local_style_2.css b/copri4/main/css/local_style_2.css index bc9c110..e5cf4be 100755 --- a/copri4/main/css/local_style_2.css +++ b/copri4/main/css/local_style_2.css @@ -578,7 +578,7 @@ div#Headerlogo { padding:4px 10px; height:48px; margin: -18px -12px !important; - width:300px; + width:350px; text-align:left; } diff --git a/copri4/main/src/Mod/APIfunc.pm b/copri4/main/src/Mod/APIfunc.pm index 83e870b..42e97be 100755 --- a/copri4/main/src/Mod/APIfunc.pm +++ b/copri4/main/src/Mod/APIfunc.pm @@ -505,6 +505,7 @@ sub service_update(){ "ct.close_time" => "is::null", int10 => "1", int28 => "3", + end_time => ">=::(now() - interval '5 min')", }; my $ctpos = { c_id => 0 }; @@ -553,7 +554,7 @@ sub service_update(){ table_pos => "contenttranspos", fetch => "one", ca_id => "$auth->{c_id}", - #end_time => ">=::(now() - interval '10 minutes')", + end_time => ">=::(now() - interval '5 min')", }; my $post_record = { c_id => 0 }; $post_record = $dbt->collect_post($dbh_operator,$postref); @@ -1749,7 +1750,7 @@ sub rental_to_feedback{ int10 => "1", int11 => "3",#sig system int28 => "3",#set count on sig rental_end - #end_time => ">=::(now() - interval '5 min')", + end_time => ">=::(now() - interval '5 min')", }; my $ctpos = { c_id => 0 }; $ctpos = $dbt->collect_post($dbh,$pref); diff --git a/copri4/main/src/Tpl/BaseEdit.pm b/copri4/main/src/Tpl/BaseEdit.pm index 44e0db1..77c2ce3 100755 --- a/copri4/main/src/Tpl/BaseEdit.pm +++ b/copri4/main/src/Tpl/BaseEdit.pm @@ -104,7 +104,7 @@ sub tpl(){ $save_key = "save_adr"; $edit_template = "$ctrel->{template_id}" . "000"; $tpl = $db->get_tpl($edit_template); - }elsif($node_meta->{ct_table} eq "users" && $u_id){ + }elsif($node_meta->{ct_table} eq "users" && $node_meta->{tpl_id} == 198 && $u_id){ my $ref = { table => "$node_meta->{ct_table}", fetch => "one", diff --git a/copri4/main/src/Tpl/Calorin.pm b/copri4/main/src/Tpl/Calorin.pm index 9d8d0ed..1d37db0 100755 --- a/copri4/main/src/Tpl/Calorin.pm +++ b/copri4/main/src/Tpl/Calorin.pm @@ -125,7 +125,7 @@ sub tpl(){ print $q->end_form; print $q->start_form(); - print "