diff --git a/modules/life_cycle/batch/extract_data.php b/modules/life_cycle/batch/extract_data.php
index 2f0d8aad5f283d81048ebb40c2fa64319b24e0a3..f8e8cd7cd0fc12f3cf739c57dc79ef7435fb3651 100755
--- a/modules/life_cycle/batch/extract_data.php
+++ b/modules/life_cycle/batch/extract_data.php
@@ -149,7 +149,7 @@ try {
#### TAGS ####
$stmt2 = Bt_doQuery(
$GLOBALS['db'],
- "SELECT tags.tag_label FROM tags, tag_res WHERE tags.tag_id = tag_res.tag_id and tag_res.res_id = ? and tags.coll_id = ?", array($selectedFile->res_id, $GLOBALS['collections'][0]['id'])
+ "SELECT tags.label FROM tags, tag_res WHERE tags.id = tag_res.tag_id and tag_res.res_id = ?", array($selectedFile->res_id)
);
$labelTags = "";
@@ -500,4 +500,4 @@ function format_date_db($date, $insert=true, $databasetype= '', $withTimeZone=fa
} else {
return '';
}
-}
\ No newline at end of file
+}
diff --git a/modules/reports/xml/reports.xml b/modules/reports/xml/reports.xml
index dd4704062ace2f6d24444383e045ec017a1c9382..a85124db160b2068e526561ee610ce637383f49e 100755
--- a/modules/reports/xml/reports.xml
+++ b/modules/reports/xml/reports.xml
@@ -1,16 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ROOT>
- <REPORT>
- <ID>folder_view_stat</ID>
- <LABEL>_FOLDER_VIEW_STAT</LABEL>
- <DESCRIPTION>_FOLDER_VIEW_STAT</DESCRIPTION>
- <URL>folder_view_stats</URL>
- <IN_MENU_REPORTS>true</IN_MENU_REPORTS><!-- the report can be accessed by the menu report -->
- <ENABLED>true</ENABLED>
- <ORIGIN>module</ORIGIN> <!-- apps or module -->
- <MODULE>folder</MODULE>
- <MODULE_LABEL>_FOLDERS_COMMENT</MODULE_LABEL>
- </REPORT>
<REPORT>
<ID>entity_vol_stat</ID>
<LABEL>_ENTITY_VOL_STAT</LABEL>
diff --git a/modules/tags/class/TagControler_Abstract.php b/modules/tags/class/TagControler_Abstract.php
index 4763f0ade5f6938bedb46212cb80dc01ffaea031..62c863cfed88eabdf86ee4bd5e635df28192f446 100755
--- a/modules/tags/class/TagControler_Abstract.php
+++ b/modules/tags/class/TagControler_Abstract.php
@@ -106,9 +106,9 @@ abstract class tag_controler_Abstract extends ObjectControler
//CHECK TAG WHO IS NOT RESTRICTED
$stmt = $db->query(
- 'SELECT tag_id'
+ 'SELECT id'
. ' FROM tags'
- . ' WHERE tag_id NOT IN (select distinct(tag_id) from tags_entities)',
+ . ' WHERE id NOT IN (select distinct(tag_id) from tags_entities)',
array()
);
$freeTagIdList = $stmt->fetchAll(PDO::FETCH_COLUMN, 0);
@@ -118,24 +118,24 @@ abstract class tag_controler_Abstract extends ObjectControler
if (!empty($tagIdList)) {
$tagIdList = "'".implode("','", $tagIdList)."'";
- $where = ' WHERE tag_id IN ('.$tagIdList.')';
+ $where = ' WHERE id IN ('.$tagIdList.')';
} else {
// NO TAG ALLOWED
- $where = ' WHERE tag_id = 0';
+ $where = ' WHERE id = 0';
}
$stmt = $db->query(
- 'SELECT tag_id, tag_label FROM '
+ 'SELECT id, label FROM '
. _TAG_TABLE_NAME
. $where
- . ' ORDER BY tag_label ASC ',
+ . ' ORDER BY label ASC ',
$where_what
);
} else {
$stmt = $db->query(
- 'SELECT tag_id, tag_label FROM '
+ 'SELECT id, label FROM '
. _TAG_TABLE_NAME
- . ' ORDER BY tag_label ASC ',
+ . ' ORDER BY label ASC ',
$where_what
);
}
@@ -144,9 +144,8 @@ abstract class tag_controler_Abstract extends ObjectControler
if ($stmt->rowCount() > 0) {
while ($tag=$stmt->fetchObject()) {
- $tougue['tag_id'] = $tag->tag_id;
- $tougue['tag_label'] = $tag->tag_label;
- $tougue['coll_id'] = $tag->coll_id;
+ $tougue['tag_id'] = $tag->id;
+ $tougue['tag_label'] = $tag->label;
array_push($return, $tougue);
}
return $return;
@@ -168,13 +167,12 @@ abstract class tag_controler_Abstract extends ObjectControler
$entities = array();
$stmt = $db->query(
- 'SELECT tag_id, tag_label, coll_id FROM ' . _TAG_TABLE_NAME
- . ' WHERE tag_id = ? AND'
- . ' coll_id = ?',
- array($tag_id, $coll_id)
+ 'SELECT id, label FROM ' . _TAG_TABLE_NAME
+ . ' WHERE id = ?',
+ array($tag_id)
);
- self::set_specific_id('tag_id');
+ self::set_specific_id('id');
$tag = $stmt->fetchObject();
@@ -208,10 +206,9 @@ abstract class tag_controler_Abstract extends ObjectControler
$db = new Database();
$stmt = $db->query(
- 'SELECT tag_id, tag_label FROM '._TAG_TABLE_NAME
- . ' WHERE tag_label = ? AND'
- . ' coll_id = ?',
- array($tag_label,$coll_id)
+ 'SELECT id, label FROM '._TAG_TABLE_NAME
+ . ' WHERE label = ?',
+ array($tag_label)
);
$tag=$stmt->fetchObject();
@@ -253,9 +250,9 @@ abstract class tag_controler_Abstract extends ObjectControler
$stmt = $db->query(
"SELECT tag_res.tag_id FROM tag_res"
- . " INNER JOIN tags ON tag_res.tag_id = tags.tag_id"
- . " WHERE tag_res.res_id = ? AND tags.coll_id = ?",
- array($res_id,$coll_id)
+ . " INNER JOIN tags ON tag_res.tag_id = tags.id"
+ . " WHERE tag_res.res_id = ?",
+ array($res_id)
);
//$db->show();
@@ -278,8 +275,8 @@ abstract class tag_controler_Abstract extends ObjectControler
*/
$db = new Database();
$stmt = $db->query(
- "SELECT tag_label FROM " ._TAG_TABLE_NAME
- . " WHERE res_id = ? AND coll_id = ? AND tag_label = ?",
+ "SELECT label FROM " ._TAG_TABLE_NAME
+ . " WHERE res_id = ? AND coll_id = ? AND label = ?",
array($res_id,$coll_id,$tag_label)
);
@@ -305,7 +302,7 @@ abstract class tag_controler_Abstract extends ObjectControler
return true;
}
}
- return fasle;
+ return false;
//$db->show();
}
diff --git a/sql/data_en.sql b/sql/data_en.sql
index 6574c019e7784f59da6852af22fe686b9b1d4070..82838195cfc7c5f5fc9e37c0fec3021f763e3e10 100644
--- a/sql/data_en.sql
+++ b/sql/data_en.sql
@@ -1157,21 +1157,19 @@ INSERT INTO templates_doctype_ext (template_id, type_id, is_generated) VALUES (9
--KEYWORDS / TAGS
------------
TRUNCATE TABLE tags;
-ALTER SEQUENCE tag_id_seq RESTART WITH 1;
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('SEMINAIRE', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('INNOVATION', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('MAARCH', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('ENVIRONNEMENT', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('PARTENARIAT', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('JUMELAGE', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('ECONOMIE', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('ASSOCIATIONS', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('RH', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('BUDGET', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('QUARTIERS', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('LITTORAL', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('SPORT', 'letterbox_coll', 'COU');
-Select setval('tag_id_seq', (select max(tag_id)+1 from tags), false);
+INSERT INTO tags (label, entity_id_owner) VALUES ('SEMINAIRE', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('INNOVATION', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('MAARCH', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('ENVIRONNEMENT', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('PARTENARIAT', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('JUMELAGE', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('ECONOMIE', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('ASSOCIATIONS', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('RH', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('BUDGET', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('QUARTIERS', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('LITTORAL', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('SPORT', 'COU');
TRUNCATE TABLE tags_entities;
INSERT INTO tags_entities (tag_id, entity_id) VALUES (1, 'COU');
diff --git a/sql/data_fr.sql b/sql/data_fr.sql
index 518d8ad2ec2d2bff004ec01cb30e82edced13194..893ed91c0b3d2cbb27f7c508ed8930f47b2f85f7 100755
--- a/sql/data_fr.sql
+++ b/sql/data_fr.sql
@@ -1359,21 +1359,19 @@ INSERT INTO templates_doctype_ext (template_id, type_id, is_generated) VALUES (9
--KEYWORDS / TAGS
------------
TRUNCATE TABLE tags;
-ALTER SEQUENCE tag_id_seq RESTART WITH 1;
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('SEMINAIRE', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('INNOVATION', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('MAARCH', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('ENVIRONNEMENT', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('PARTENARIAT', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('JUMELAGE', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('ECONOMIE', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('ASSOCIATIONS', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('RH', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('BUDGET', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('QUARTIERS', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('LITTORAL', 'letterbox_coll', 'COU');
-INSERT INTO tags (tag_label, coll_id, entity_id_owner) VALUES ('SPORT', 'letterbox_coll', 'COU');
-Select setval('tag_id_seq', (select max(tag_id)+1 from tags), false);
+INSERT INTO tags (label, entity_id_owner) VALUES ('SEMINAIRE', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('INNOVATION', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('MAARCH', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('ENVIRONNEMENT', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('PARTENARIAT', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('JUMELAGE', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('ECONOMIE', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('ASSOCIATIONS', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('RH', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('BUDGET', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('QUARTIERS', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('LITTORAL', 'COU');
+INSERT INTO tags (label, entity_id_owner) VALUES ('SPORT', 'COU');
TRUNCATE TABLE tags_entities;
INSERT INTO tags_entities (tag_id, entity_id) VALUES (1, 'COU');
@@ -1459,7 +1457,6 @@ VALUES (5, '[notification courrier] Alerte 2', '[notification] Alerte 2', '<p><f
<td><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.typist]</font></td>
<td>
<p><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.contact_society] [res_letterbox.contact_firstname] [res_letterbox.contact_lastname][res_letterbox.function][res_letterbox.address_num][res_letterbox.address_street][res_letterbox.address_postal_code][res_letterbox.address_town]</font></p>
-<p><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.tag_label]</font></p>
</td>
<td><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.doc_date;block=tr;frm=dd/mm/yyyy]</font></td>
<td><font face="arial,helvetica,sans-serif" color="#FF0000"><strong><font size="2">[res_letterbox.subject]</font></strong></font></td>
@@ -1491,7 +1488,6 @@ VALUES (6, '[notification courrier] Alerte 1', '[notification] Alerte 1', '<p><f
<td><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.typist]</font></td>
<td>
<p><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.contact_society] [res_letterbox.contact_firstname] [res_letterbox.contact_lastname][res_letterbox.function][res_letterbox.address_num][res_letterbox.address_street][res_letterbox.address_postal_code][res_letterbox.address_town]</font></p>
-<p><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.tag_label]</font></p>
</td>
<td><font face="arial,helvetica,sans-serif" size="2">[res_letterbox.doc_date;block=tr;frm=dd/mm/yyyy]</font></td>
<td><font face="arial,helvetica,sans-serif" color="#FF0000"><strong><font size="2">[res_letterbox.subject]</font></strong></font></td>