Commit 6c953faa authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Fixes: #1519 Copy/Paste should be fixed

Showing with 3 additions and 4 deletions
+3 -4
...@@ -36,12 +36,12 @@ class CopyPasteHandler { ...@@ -36,12 +36,12 @@ class CopyPasteHandler {
/*! /*!
* \brief This array contains all dns of the currently copyied objects * \brief This array contains all dns of the currently copyied objects
*/ */
var $queue = array(); var $queue = array();
/*! /*!
* \brief The dn of the last edited object * \brief The dn of the last edited object
*/ */
var $lastdn = ""; var $lastdn = "";
var $disallowed_objects = array(); var $disallowed_objects = array();
var $objects_to_fix = array(); var $objects_to_fix = array();
...@@ -157,7 +157,6 @@ class CopyPasteHandler { ...@@ -157,7 +157,6 @@ class CopyPasteHandler {
if ($entry['method'] == "copy") { if ($entry['method'] == "copy") {
$attrs_wrapper = new stdClass(); $attrs_wrapper = new stdClass();
$attrs_wrapper->attrs = $entry['source_data']; $attrs_wrapper->attrs = $entry['source_data'];
echo "<h1>Creating tab object with copied_object as parameter</h1>";
$entry['object'] = new $tab_c($this->config, $this->config->data['TABS'][$tab_o], "new", $tab_a, $attrs_wrapper); $entry['object'] = new $tab_c($this->config, $this->config->data['TABS'][$tab_o], "new", $tab_a, $attrs_wrapper);
$entry['object']->set_acl_base($base); $entry['object']->set_acl_base($base);
} else { } else {
......
...@@ -26,7 +26,7 @@ class deptabs extends tabs ...@@ -26,7 +26,7 @@ class deptabs extends tabs
var $moved = FALSE; var $moved = FALSE;
var $base_name = "department"; var $base_name = "department";
function deptabs($config, $data, $dn, $category, $copied_object) function deptabs($config, $data, $dn, $category, $copied_object = NULL)
{ {
parent::tabs($config, $data, $dn, $category, $copied_object); parent::tabs($config, $data, $dn, $category, $copied_object);
......
  • bmortier @bmortier

    mentioned in issue #560

    By Côme Chilliet on 2017-09-02T14:51:15 (imported from GitLab)

    ·

    mentioned in issue #560

    By Côme Chilliet on 2017-09-02T14:51:15 (imported from GitLab)

    Toggle commit list
Supports Markdown
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