X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_glpiDeviceManagement.inc;h=6573cb9a690dbace39bdfa0d2635c451ecad8e99;hb=7a6a428eb1c6534e448094d51bc6a542fe832bb9;hp=e3a5497bc2f6a429ea1a62c3d565d22c170303f9;hpb=f06e60f1c123e7a0ae470ef580807773e74b9399;p=gosa.git
diff --git a/plugins/admin/systems/class_glpiDeviceManagement.inc b/plugins/admin/systems/class_glpiDeviceManagement.inc
index e3a5497bc..6573cb9a6 100644
--- a/plugins/admin/systems/class_glpiDeviceManagement.inc
+++ b/plugins/admin/systems/class_glpiDeviceManagement.inc
@@ -114,7 +114,7 @@ class glpiDeviceManagement extends plugin
}elseif(isset($tmp['designation'])){
$smarty->assign("warning", sprintf(_("You're about to delete the glpi device '%s'."), $tmp['designation']));
}else{
- print_a(_("Can't detect object name."));
+ print_red(_("Can't detect object name."));
}
return($smarty->fetch(get_template_path('remove_glpi.tpl', TRUE)));
@@ -122,8 +122,20 @@ class glpiDeviceManagement extends plugin
/* Delete entry, but check if this device is in currently in use */
if(isset($_POST['delete_glpi_confirm'])){
- if($this->parent->handle->is_deviceUsed($this->delete)){
- print_red(_("Can't delete this device, it is actually in use by some glpi accounts. Remove this relation first."));
+ if(count($this->parent->handle->is_deviceUsed($this->delete))){
+
+ $tmp = $this->parent->handle->is_deviceUsed($this->delete);
+
+ $names = "";
+ foreach($tmp as $name){
+ $names .= ", ".$name;
+ }
+ $names = preg_replace("/^, /","",$names);
+ $names = trim($names);
+ if(count($tmp) == 3){
+ $names .= " ...";
+ }
+ print_red(sprintf(_("You can't delete this device, it is still in use by these system(s) '%s'"),$names));
}else{
$this->parent->handle->deleteDevice($this->delete);
$this->reload();
@@ -172,8 +184,8 @@ class glpiDeviceManagement extends plugin
$divlist->SetEntriesPerPage(0);
$divlist->SetHeader(array(
array("string" => " ", "attach" => "style='text-align:center;width:20px;'"),
- array("string" => _("devices")." / "._("Departments"), "attach" => "style=''"),
- array("string" => _("Use"), "attach" => "style='width:60px;border-right:0px;text-align:right;'" )));
+ array("string" => _("devices"), "attach" => "style=''"),
+ array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'" )));
$edit = "%s";
$editdel = "
";
@@ -196,7 +208,7 @@ class glpiDeviceManagement extends plugin
}
/* Dawn databse struckture ....*/
- if(empty($user['comment'])) {
+ if(empty($user['comment']) && isset($user['comments'])) {
$user['comment'] = $user['comments'];
}
@@ -212,29 +224,29 @@ class glpiDeviceManagement extends plugin
" ".
" ".
+ src='images/mainboard.png' title='"._("New mainbord")."' alt='"._("MB")."' name='new_moboard'> ".
" ".
+ src='images/processor.png' title='"._("New processor")."' alt='"._("P")."' name='new_processor'> ".
" ".
+ src='images/server.png' title='"._("New case")."' alt='"._("C")."' name='new_case'> ".
" ".
+ src='images/net_hardware.png' title='"._("New network interface")."' alt='"._("NI")."' name='new_iface'> ".
" ".
+ src='images/memory.png' title='"._("New ram")."' alt='"._("R")."' name='new_ram'> ".
" ".
+ src='images/fai_partitionTable.png' title='"._("New hard disk")."' alt='"._("HDD")."' name='new_hdd'> ".
" ".
+ src='images/drives.png' title='"._("New drive")."' alt='"._("D")."' name='new_drive'> ".
" ".
+ src='images/hardware.png' title='"._("New controller")."' alt='"._("CS")."' name='new_control'> ".
" ".
+ src='images/gfx_hardware.png' title='"._("New graphics card")."' alt='"._("GC")."' name='new_gfxcard'> ".
" ".
+ src='images/snd_hardware.png' title='"._("New sound card")."' alt='"._("SC")."' name='new_sndcard'> ".
" ".
+ src='images/power.png' title='"._("New power supply")."' alt='"._("PS")."' name='new_power'> ".
" ".
+ src='images/fai_template.png' title='"._("New misc device")."' alt='"._("OC")."' name='new_pci'> ".
"";
$filter= $_SESSION['glpiDeviceRegex'];
@@ -243,8 +255,8 @@ class glpiDeviceManagement extends plugin
$smarty->assign("search_image", get_template_path('images/search.png'));
$smarty->assign("searchu_image", get_template_path('images/search_user.png'));
$smarty->assign("tree_image", get_template_path('images/tree.png'));
- $smarty->assign("infoimage", get_template_path('images/info.png'));
- $smarty->assign("launchimage", get_template_path('images/launch.png'));
+ $smarty->assign("infoimage", get_template_path('images/info_small.png'));
+ $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
$smarty->assign("apply", apply_filter());
$smarty->assign("alphabet", generate_alphabet());
$smarty->assign("device_regex", $filter['device_regex']);
@@ -323,7 +335,8 @@ class glpiDeviceManagement extends plugin
*/
function check($attr)
{
- $message = array();
+ /* Call common method to give check the hook */
+ $message= plugin::check();
if(isset($attr['designation'])){
$str2 = "designation";