roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-05-10 22:16:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

copri feedback-dialog and new-content fix

Browse source
This commit is contained in:
ragu 2023-09-05 09:12:06 +02:00
parent a285cc0d02
commit 4734370702
8 changed files with 37 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

28
copri4/shareedms-operator/src/Lib/Mlogic.pm
View file

@ -302,9 +302,8 @@ sub tplselect(){
my $users_dms = shift;
my $mode = shift || "";
my $varenv = shift;
my $feedb = shift || "";
my $feedb_req = shift || {};
my $return = "";
my $sort = "";
my $lang = "de";
my $tpl_name = $node_meta->{tpl_name};
@ -312,15 +311,14 @@ sub tplselect(){
my $ct_table = $node_meta->{ct_table};
my $parent_id = $node_meta->{parent_id};
my $main_id = $node_meta->{main_id};
#print Dumper($node_meta);
#exit;
my $feedb = { message => '' };
if($node_meta->{tpl_id} =~ /194|195|199/ && $node_meta->{ct_table} eq "contentuser"){
require "Tpl/SubListe.pm";
$feedb = &SubListe::tpl($node_meta,$users_dms,$feedb);
}elsif($node_meta->{ct_table} eq "contentuser"){
require "Tpl/MandantConf.pm";
$return = &MandantConf::tpl($node_meta,$users_dms,$mode,$feedb);
$feedb = &MandantConf::tpl($node_meta,$users_dms,$feedb);
}elsif($node_meta->{tpl_id} == 1 && $node_meta->{main_id} == 200017){
require "Tpl/Karte_osm.pm";
&Karte_osm::tpl($node_meta,$users_dms,$mode,$varenv,"",$feedb);
@ -334,24 +332,26 @@ sub tplselect(){
require "Tpl/Calorin.pm";
&Calorin::tpl($node_meta,$users_dms,$mode,$feedb);
}
#print Dumper($feedb);
#exit;
if(ref($feedb) eq "HASH" && $feedb->{message} =~ /failure/){
if(ref($feedb_req) eq "HASH" && $feedb_req->{message} =~ /failure/){
require "Mod/Failure.pm";
&Failure::tpl($varenv,$users_dms->{u_id},$feedb);
}elsif($return =~ /failure/){
$feedb->{message} = "$return";
require "Mod/Failure.pm";
&Failure::tpl($varenv,$users_dms->{u_id},$feedb);
&Failure::tpl($varenv,$users_dms->{u_id},$feedb_req);
}else{
if(($R::ct_trans !~ /close/) && ($ct_table =~ /contenttrans/) && ($R::ct_trans || $R::trans2edit || $R::ctpos_activ || $R::select_part || $R::set_main_id)){
&Modalbox::mobox($node_meta,$users_dms,$return);
&Modalbox::mobox($node_meta,$users_dms,$feedb_req);
}elsif(($R::ct_trans !~ /close/) && ($ct_table =~ /content$|contentadr|contentuser|contentpos|users$|contenttranspos/ && ($R::ct_trans || $R::rel_edit || $R::base_edit)) || ($R::node2edit && $R::node2edit =~ /edit/)){
&Modalbox3::mobox3($node_meta,$users_dms,$feedb,$return,$mode) if($R::rel_edit !~ /delete|save/ && $R::ct_trans !~ /delete/ && $R::base_edit !~ /delete|save_pos/ && !$R::service_id);
&Modalbox3::mobox3($node_meta,$users_dms,$feedb_req) if($R::rel_edit !~ /delete|save/ && $R::ct_trans !~ /delete/ && $R::base_edit !~ /delete|save_pos/ && !$R::service_id);
}
}
if(ref($feedb) eq "HASH" && $feedb->{message}){
#prio feedback on data request
if(ref($feedb_req) eq "HASH"){
$bw->return_feedback($node_meta,$users_dms,$feedb_req);
}elsif(ref($feedb) eq "HASH" && $feedb->{message}){
$bw->return_feedback($node_meta,$users_dms,$feedb);
}
}
1;