Skip to content

The roby patch #1

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
TheRoby wants to merge 2 commits into
base: main
Choose a base branch
from
Open

The roby patch #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de9bc92
Update deployfile.class.php
TheRoby Mar 8, 2024
0f00fd1
Update deployfile.class.php
TheRoby Mar 8, 2024
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
4 changes: 3 additions & 1 deletion inc/deployfile.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,8 @@ public function displayAjaxValues($config, $request_data, $rand, $mode)
*/
public static function showServerFileTree($rand)
{
$pfConfig = new PluginGlpiinventoryConfig();
$dir = $pfConfig->getValue('server_upload_path');
echo "<script type='text/javascript'>";
echo "Ext.Ajax.defaultHeaders = {'X-Glpi-Csrf-Token' : getAjaxCsrfToken()};";
echo "var Tree_Category_Loader$rand = new Ext.tree.TreeLoader({
Expand Down Expand Up @@ -418,7 +420,7 @@ public static function showServerFileTree($rand)

echo '<div class="alert alert-info d-flex" role="alert">';
echo '<i class="fas fa-exclamation-circle fa-2x me-2"></i>';
echo '<p>' . sprintf(__('Files need to be uploaded to %s folder to be displayed here', 'glpiinventory'), '<mark>/files/_plugins/glpiinventory/upload/</mark>') . '</p>';
echo '<p>' . sprintf(__('Files need to be uploaded to %s folder to be displayed here', 'glpiinventory'), "<mark>$dir</mark>") . '</p>';
echo '</div>';

echo "<div id='tree_projectcategory$rand' ></div>";
Expand Down