From d0f859d33229cf80e051661e2ff023ffabe554a6 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 2 Jul 2018 15:19:48 +0200
Subject: [PATCH] [REFACTORING] Remove use of res_versions
---
.../indexing_searching/details.php | 55 -------------------
.../view_resource_controler.php | 2 +-
modules/content_management/xml/services.xml | 34 ------------
3 files changed, 1 insertion(+), 90 deletions(-)
diff --git a/apps/maarch_entreprise/indexing_searching/details.php b/apps/maarch_entreprise/indexing_searching/details.php
index a063036e262..e5a51695da9 100755
--- a/apps/maarch_entreprise/indexing_searching/details.php
+++ b/apps/maarch_entreprise/indexing_searching/details.php
@@ -613,61 +613,6 @@ if ($stmt->rowCount() == 0) {
echo $sendmail;
}
- //VERSIONS TAB
- if ($core->test_service('view_version_letterbox', 'apps', false)) {
- $version = '';
- $versionTable = $security->retrieve_version_table_from_coll_id(
- $coll_id
- );
- $selectVersions = 'SELECT res_id FROM '
- .$versionTable." WHERE res_id_master = ? and status <> 'DEL' order by res_id desc";
-
- $stmt = $db->query($selectVersions, array($s_id));
- $nb_versions_for_title = $stmt->rowCount();
- $lineLastVersion = $stmt->fetchObject();
- $lastVersion = $lineLastVersion->res_id;
- if ($lastVersion != '') {
- $objectId = $lastVersion;
- $objectTable = $versionTable;
- } else {
- $objectTable = $security->retrieve_table_from_coll(
- $coll_id
- );
- $objectId = $s_id;
- $_SESSION['cm']['objectId4List'] = $s_id;
- }
- if ($nb_versions_for_title == 0) {
- $extend_title_for_versions = '0';
- $class = 'nbResZero';
- if ($nbAttach == 0 && strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome')) {
- $style = 'visibility:hidden;font-size: 10px;';
- } else {
- $style = 'display:none;font-size: 10px;';
- }
-
- $style2 = 'color:#9AA7AB;font-size:2em;padding-left: 15px;padding-right: 15px;';
- } else {
- $extend_title_for_versions = $nb_versions_for_title;
- $class = 'nbRes';
- $style = 'font-size: 10px;';
- }
- $_SESSION['cm']['resMaster'] = '';
-
- $pathScriptTab = $_SESSION['config']['businessappurl']
- .'index.php?display=true&page=show_versions_tab&collId='.$coll_id.'&resId='.$s_id.'&objectTable='.$objectTable;
- $version .= '<div class="fa fa-code-branch DetailsTabFunc" id="DetailsCodeForkTab" style="font-size:2em;padding-left: 15px;';
- if (strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome')) {
- $version .= 'padding-right: 0px;';
- } else {
- $version .= 'padding-right: 15px;';
- }
- $version .= '"title="'._VERSIONS.'" onclick="loadSpecificTab(\'uniqueDetailsIframe\',\''.$pathScriptTab.'\');tabClicked(\'DetailsCodeForkTab\',true);">';
- $version .= ' <sup><span id="nbVersions" ';
- $version .= 'class="'.$class.'" style="'.$styleBadge.'">'.$extend_title_for_versions.'</span></sup>';
- $version .= '</div>';
- echo $version;
- }
-
//LINKS TAB
$Links = '';
$pathScriptTab = $_SESSION['config']['businessappurl'].'index.php?display=true&page=show_links_tab';
diff --git a/apps/maarch_entreprise/indexing_searching/view_resource_controler.php b/apps/maarch_entreprise/indexing_searching/view_resource_controler.php
index 2df8b22620c..64833d4afd7 100755
--- a/apps/maarch_entreprise/indexing_searching/view_resource_controler.php
+++ b/apps/maarch_entreprise/indexing_searching/view_resource_controler.php
@@ -220,7 +220,7 @@ if ($s_id == '') {
exit();
}
if (
- $versionTable <> ''
+ $versionTable <> '' && $versionTable == 'res_version_attachments'
&& !isset($_REQUEST['original'])
&& !isset($_REQUEST['aVersion'])
) {
diff --git a/modules/content_management/xml/services.xml b/modules/content_management/xml/services.xml
index f3367eec2b6..d15cc8033fc 100755
--- a/modules/content_management/xml/services.xml
+++ b/modules/content_management/xml/services.xml
@@ -1,37 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
- <!--<SERVICE>
- <id>add_new_version</id>
- <name>_ADD_NEW_VERSION</name>
- <comment>_ADD_NEW_VERSION</comment>
- <servicepage>none.php</servicepage>
- <servicetype>use</servicetype>
- <system_service>false</system_service>
- <enabled>true</enabled>
- <WHEREAMIUSED>
- <page>details.php</page>
- <nature>include</nature>
- </WHEREAMIUSED>
- <WHEREAMIUSED>
- <page>process.php</page>
- <nature>include</nature>
- </WHEREAMIUSED>
- </SERVICE>
- <SERVICE>
- <id>view_version_letterbox</id>
- <name>_VIEW_VERSIONS</name>
- <comment>_VIEW_VERSIONS</comment>
- <servicepage>none.php</servicepage>
- <servicetype>use</servicetype>
- <system_service>false</system_service>
- <enabled>true</enabled>
- <WHEREAMIUSED>
- <page>details.php</page>
- <nature>include</nature>
- </WHEREAMIUSED>
- <WHEREAMIUSED>
- <page>process.php</page>
- <nature>include</nature>
- </WHEREAMIUSED>
- </SERVICE>-->
</root>
--
GitLab