All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 67fc1d09 authored by Jonathon Duerig's avatar Jonathon Duerig

Fix for Issue #405: Hide deprecated system images instead of just marking them.

parent ec7b6907
......@@ -172,13 +172,13 @@ function Do_GetImageList()
if ($this_user && $this_user->webonly()) {
# Only public images
$publicImages = ImagesWhere("where v.visibility='public' and i.project_urn not like '%$systemProject+authority+sa'", $dblink);
$systemImages = ImagesWhere("where i.project_urn like '%$systemProject+authority+sa'", $dblink);
$systemImages = ImagesWhere("where i.project_urn like '%$systemProject+authority+sa' and v.deprecated is not NULL", $dblink);
} else if ($this_user) {
$user_urn = addslashes($this_user->urn());
# Public images that weren't created by the user
$publicImages = ImagesWhere("where v.visibility='public' and i.project_urn not like '%$systemProject+authority+sa' and v.creator_urn != '$user_urn'", $dblink);
# System images that weren't created by the user
$systemImages = ImagesWhere("where v.visibility='public' and i.project_urn like '%$systemProject+authority+sa' and v.creator_urn != '$user_urn'", $dblink);
$systemImages = ImagesWhere("where v.visibility='public' and i.project_urn like '%$systemProject+authority+sa' and v.creator_urn != '$user_urn' and v.deprecated is not NULL", $dblink);
# All images for user
$myImages = ImagesWhere("where v.creator_urn='$user_urn'", $dblink);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment