lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix import_key was erased after update

Browse Source
This commit is contained in:
Laurent Destailleur 2020-04-04 18:35:40 +02:00
parent c22a6ad98c
commit 9307e3821f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/website/class/websitepage.class.php
View File

@ -206,7 +206,8 @@ class WebsitePage extends CommonObject
$sql .= " t.tms as date_modification,"; $sql .= " t.tms as date_modification,";
$sql .= " t.fk_user_creat,"; $sql .= " t.fk_user_creat,";
$sql .= " t.author_alias,"; $sql .= " t.author_alias,";
$sql .= " t.fk_user_modif"; $sql .= " t.fk_user_modif,";
$sql .= " t.import_key";
$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t'; $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
//$sql .= ' WHERE entity IN ('.getEntity('website').')'; // entity is on website level //$sql .= ' WHERE entity IN ('.getEntity('website').')'; // entity is on website level
$sql .= ' WHERE 1 = 1'; $sql .= ' WHERE 1 = 1';
@ -265,6 +266,7 @@ class WebsitePage extends CommonObject
$this->fk_user_creat = $obj->fk_user_creat; $this->fk_user_creat = $obj->fk_user_creat;
$this->author_alias = $obj->author_alias; $this->author_alias = $obj->author_alias;
$this->fk_user_modif = $obj->fk_user_modif; $this->fk_user_modif = $obj->fk_user_modif;
$this->import_key = $obj->import_key;
} }
$this->db->free($resql); $this->db->free($resql);
@ -319,7 +321,8 @@ class WebsitePage extends CommonObject
$sql .= " t.tms as date_modification,"; $sql .= " t.tms as date_modification,";
$sql .= " t.fk_user_creat,"; $sql .= " t.fk_user_creat,";
$sql .= " t.author_alias,"; $sql .= " t.author_alias,";
$sql .= " t.fk_user_modif"; $sql .= " t.fk_user_modif,";
$sql .= " t.import_key";
$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t'; $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
$sql .= ' WHERE t.fk_website = '.$websiteid; $sql .= ' WHERE t.fk_website = '.$websiteid;
// Manage filter // Manage filter
@ -374,6 +377,7 @@ class WebsitePage extends CommonObject
$record->fk_user_creat = $obj->fk_user_creat; $record->fk_user_creat = $obj->fk_user_creat;
$record->author_alias = $obj->author_alias; $record->author_alias = $obj->author_alias;
$record->fk_user_modif = $obj->fk_user_modif; $record->fk_user_modif = $obj->fk_user_modif;
$record->import_key = $obj->import_key;
//var_dump($record->id); //var_dump($record->id);
$records[$record->id] = $record; $records[$record->id] = $record;
} }
@ -560,6 +564,7 @@ class WebsitePage extends CommonObject
if ($istranslation) $object->fk_page = $fromid; if ($istranslation) $object->fk_page = $fromid;
else $object->fk_page = 0; else $object->fk_page = 0;
if (!empty($newwebsite)) $object->fk_website = $newwebsite; if (!empty($newwebsite)) $object->fk_website = $newwebsite;
$object->import_key = '';
// Create clone // Create clone
$object->context['createfromclone'] = 'createfromclone'; $object->context['createfromclone'] = 'createfromclone';

2
scripts/website/migrate-news-joomla2dolibarr.php
View File

@ -184,7 +184,7 @@ if ($mode == 'confirm' && ! $error) {
print $nbimported." page(s) imported with importid=".$importid."\n"; print $nbimported." page(s) imported with importid=".$importid."\n";
$db->commit(); $db->commit();
} else { } else {
print "Rollback\n"; print "Rollback (mode=test)\n";
$db->rollback(); $db->rollback();
} }