summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 406e322)
raw | patch | inline | side by side (parent: 406e322)
author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Tue, 17 Jan 2006 06:27:10 +0000 (06:27 +0000) | ||
committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Tue, 17 Jan 2006 06:27:10 +0000 (06:27 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2495 594d385d-05f5-0310-b6e9-bd551577e9d8
diff --git a/plugins/admin/systems/class_glpiAttachmentPool.inc b/plugins/admin/systems/class_glpiAttachmentPool.inc
index 853d2190ef640b40f389c8307290dce48735ed0c..4cfd7f46e470d4887c2d0ef3f93316e0dcc177bf 100644 (file)
name='new_attach' alt='"._("New Attachment"). "'> ".
"</div>";
-
$smarty->assign("attachments", $divlist->DrawList());
$smarty->assign("attachmenthead", $listhead);
$smarty->assign("search_image", get_template_path('images/search.png'));
$smarty->assign("alphabet", generate_alphabet());
$smarty->assign("attachment_regex", $_SESSION['GlpiAttachmentFilter']['filter']);
-
$display.= $smarty->fetch(get_template_path('glpiAttachmentPool.tpl', TRUE));
return($display);
}
diff --git a/plugins/admin/systems/class_glpiDeviceManagement.inc b/plugins/admin/systems/class_glpiDeviceManagement.inc
index 126ac4ad3c0d79a9cb81f26092bb14af184c7cd0..dc54bdb6d19db6ff2002009841ecde6ceda90f0d 100644 (file)
" <input class='center' type='image' align='middle'
src='mages/list_back.png' title='"._("New misc device")."' alt='"._("OC")."' name='new_pci'> ".
"</div>";
+
$filter= $_SESSION['glpiDeviceRegex'];
$smarty->assign("devicehead", $listhead);
$smarty->assign("devices", $divlist->DrawList());
$smarty->assign("alphabet", generate_alphabet());
$smarty->assign("device_regex", $filter['device_regex']);
-
$display.= $smarty->fetch(get_template_path('glpiDeviceManagement.tpl', TRUE));
return($display);
}
return($message);
}
- /* This funtions displays the tempalte for all available devices
- * This funtion is also used if we create a new device
+ /* This functions displays the template for all available devices
+ * This function is also used if we create a new device
*/
function editDevice($entry)
{
diff --git a/plugins/admin/systems/class_glpiManufacturer.inc b/plugins/admin/systems/class_glpiManufacturer.inc
index eaaaaa94185ce06c67a40fba3494b9e1783bdd3e..0c950d366a2837c35bbfc09f4249a9aa35564d9a 100644 (file)
$smarty = get_smarty();
$display = "";
+ /* Remove enterprise from db */
if((isset($_POST['remove_manu']))&&(isset($_POST['manufacturer']))){
$this->parent->handle->removeEnterprise($_POST['manufacturer']);
}
+ /* Add new Manufactuer : Open dialog with empty fields */
if(isset($_POST['add_manu'])){
$this->editMode = true;
$this->Edit_Add = "add";
}
}
+ /* Edit existing manuatctuerer data */
if((isset($_POST['edit_manu']))&&(isset($_POST['manufacturer']))){
$this->editMode = true;
$this->Edit_Add = "edit";
$this->ID = $_POST['manufacturer'];
}
+ /* close Dialog without saving */
if(isset($_POST['close_manufacturer'])){
$this->editMode=false;
}
+ /* close dialog an save all changes / adds */
if(isset($_POST['save_manufacturer'])){
-
$tmp = array();
foreach($this->attributes as $attrs){
$tmp[$attrs]=$this->$attrs;
$allok = false;
}
+ /* all checks are ok , so save changes */
if($allok){
if($this->Edit_Add == "add"){
$this->parent->handle->addEnterprise($tmp);
}
}
+ /* As long as this war is true, we have to display the edit dialog */
if($this->editMode == true){
$this->save_object();
foreach($this->attributes as $attrs){