Merge pull request #988 from itflow-org/file-delete-bugfix

Client files bugfix
This commit is contained in:
Johnny
2024-07-31 17:25:31 -04:00
committed by GitHub
2 changed files with 19 additions and 15 deletions

View File

@@ -24,7 +24,6 @@
$sql_assets_select = mysqli_query($mysqli, "SELECT * FROM assets $sql_assets_select = mysqli_query($mysqli, "SELECT * FROM assets
WHERE asset_client_id = $client_id WHERE asset_client_id = $client_id
AND asset_archived_at IS NULL AND asset_archived_at IS NULL
$exclude_condition
ORDER BY asset_name ASC" ORDER BY asset_name ASC"
); );
while ($row = mysqli_fetch_array($sql_assets_select)) { while ($row = mysqli_fetch_array($sql_assets_select)) {

View File

@@ -225,7 +225,10 @@ $num_of_files = mysqli_num_rows($sql);
<small><?php echo $file_name; ?></small> <small><?php echo $file_name; ?></small>
<a href="#" data-toggle="modal" data-target="#deleteFileModal" onclick="populateFileDeleteModal(<?php echo "$file_id , '$file_name'" ?>)" class="text-white float-right mr-1"><i class="fa fa-times"></i></a> <?php if ($session_user_role == 3) { ?>
<a href="#" data-toggle="modal" data-target="#deleteFileModal" onclick="populateFileDeleteModal(<?php echo "$file_id , '$file_name'" ?>)" class="text-white float-right mr-1"><i class="fa fa-times"></i></a>
<?php } ?>
</div> </div>
</div> </div>
</div> </div>
@@ -338,10 +341,12 @@ $num_of_files = mysqli_num_rows($sql);
<a class="dropdown-item text-danger confirm-link" href="post.php?archive_file=<?php echo $file_id; ?>"> <a class="dropdown-item text-danger confirm-link" href="post.php?archive_file=<?php echo $file_id; ?>">
<i class="fas fa-fw fa-archive mr-2"></i>Archive <i class="fas fa-fw fa-archive mr-2"></i>Archive
</a> </a>
<div class="dropdown-divider"></div> <?php if ($session_user_role == 3) { ?>
<a class="dropdown-item text-danger text-bold" href="#" data-toggle="modal" data-target="#deleteFileModal" onclick="populateFileDeleteModal(<?php echo "$file_id , '$file_name'" ?>)"> <div class="dropdown-divider"></div>
<i class="fas fa-fw fa-trash mr-2"></i>Delete <a class="dropdown-item text-danger text-bold" href="#" data-toggle="modal" data-target="#deleteFileModal" onclick="populateFileDeleteModal(<?php echo "$file_id , '$file_name'" ?>)">
</a> <i class="fas fa-fw fa-trash mr-2"></i>Delete
</a>
<?php } ?>
</div> </div>
</div> </div>
</td> </td>