Skip to content

Handle changes in latest DBIx::Perlish #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HEM42 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle changes in latest DBIx::Perlish #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions www/cgi-bin/tipp.cgi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,8 @@ sub handle_update_group
my $g : groups;

$g->id == $gid;
} || "{}";
};
$old ||= "{}";

my $old_g = expand_permissions(eval { decode_json($old->{permissions}); } || {});
my $new_g = expand_permissions($g);
Expand Down Expand Up @@ -1608,7 +1609,8 @@ sub handle_update_group
my $g : groups;

$g->id == $new_id;
} || "{}";
};
$new ||= "{}";
$new->{permissions} = expand_permissions(eval { decode_json($new->{permissions}); } || {});
return $new;
}
Expand Down Expand Up @@ -2256,14 +2258,16 @@ sub get_permissions

$u->name eq $user;
return $u->group_id;
} || $TIPP::default_group_id;
};
$gid ||= $TIPP::default_group_id;

my $json_permissions = db_fetch {
my $g : groups;

$g->id == $gid;
return $g->permissions;
} || "{}";
};
$json_permissions ||= "{}";

return expand_permissions(eval { decode_json($json_permissions); } || {});
}
Expand Down