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

Removed not used field

Browse Source
This commit is contained in:
Laurent Destailleur 2017-09-10 18:01:34 +02:00
parent 2db71cb773
commit 01664a135d
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/bookmarks/class/bookmark.class.php
View File

@ -32,7 +32,7 @@ class Bookmark extends CommonObject
public $table_element='bookmark'; public $table_element='bookmark';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto = 'bookmark'; public $picto = 'bookmark';
var $db; var $db;
var $id; var $id;
@ -111,7 +111,7 @@ class Bookmark extends CommonObject
$this->url=trim($this->url); $this->url=trim($this->url);
$this->title=trim($this->title); $this->title=trim($this->title);
if (empty($this->position)) $this->position=0; if (empty($this->position)) $this->position=0;
$now=dol_now(); $now=dol_now();
$this->db->begin(); $this->db->begin();
@ -119,14 +119,12 @@ class Bookmark extends CommonObject
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_user,dateb,url,target"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_user,dateb,url,target";
$sql.= ",title,favicon,position"; $sql.= ",title,favicon,position";
$sql.= ",entity"; $sql.= ",entity";
if ($this->fk_soc) $sql.=",fk_soc";
$sql.= ") VALUES ("; $sql.= ") VALUES (";
$sql.= ($this->fk_user > 0?"'".$this->fk_user."'":"0").","; $sql.= ($this->fk_user > 0?"'".$this->fk_user."'":"0").",";
$sql.= " '".$this->db->idate($now)."',"; $sql.= " '".$this->db->idate($now)."',";
$sql.= " '".$this->url."', '".$this->target."',"; $sql.= " '".$this->url."', '".$this->target."',";
$sql.= " '".$this->db->escape($this->title)."', '".$this->favicon."', '".$this->position."'"; $sql.= " '".$this->db->escape($this->title)."', '".$this->favicon."', '".$this->position."'";
$sql.= ", '".$conf->entity."'"; $sql.= ", '".$conf->entity."'";
if ($this->fk_soc) $sql.=",".$this->fk_soc;
$sql.= ")"; $sql.= ")";
dol_syslog("Bookmark::update", LOG_DEBUG); dol_syslog("Bookmark::update", LOG_DEBUG);
@ -243,5 +241,5 @@ class Bookmark extends CommonObject
{ {
return ''; return '';
} }
} }

3
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
View File

@ -55,7 +55,8 @@ ALTER TABLE llx_mailing MODIFY COLUMN langs varchar(64);
ALTER TABLE llx_facture_fourn ADD COLUMN date_pointoftax date DEFAULT NULL; ALTER TABLE llx_facture_fourn ADD COLUMN date_pointoftax date DEFAULT NULL;
ALTER TABLE llx_facture_fourn ADD COLUMN date_valid date; ALTER TABLE llx_facture_fourn ADD COLUMN date_valid date;
ALTER TABLE llx_bookmark DROP COLUM fk_soc;
ALTER TABLE llx_website MODIFY COLUMN ref varchar(128); ALTER TABLE llx_website MODIFY COLUMN ref varchar(128);
ALTER TABLE llx_website_page MODIFY COLUMN pageurl varchar(255); ALTER TABLE llx_website_page MODIFY COLUMN pageurl varchar(255);

1
htdocs/install/mysql/tables/llx_bookmark.sql
View File

@ -19,7 +19,6 @@
create table llx_bookmark create table llx_bookmark
( (
rowid integer AUTO_INCREMENT PRIMARY KEY, rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_soc integer,
fk_user integer NOT NULL, fk_user integer NOT NULL,
dateb datetime, dateb datetime,
url varchar(255) NOT NULL, url varchar(255) NOT NULL,