diff --git a/apps/maarch_entreprise/actions/process.php b/apps/maarch_entreprise/actions/process.php
index b89e08e943733a12ff321c53846e7bf64c7b05d7..9db5e9d9ee3fe0245ceb8446961ae43439f6d7e4 100644
--- a/apps/maarch_entreprise/actions/process.php
+++ b/apps/maarch_entreprise/actions/process.php
@@ -493,7 +493,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module
$frm_str .= '<tr align="center">';
//HISTORY
- if ($core_tools->test_service('view_doc_history', 'apps', false)) {
+ if ($core_tools->test_service('view_doc_history', 'apps', false) || $core->test_service('view_full_history', 'apps', false)) {
$frm_str .= '<td>';
$pathScriptTab = $_SESSION['config']['businessappurl']
diff --git a/apps/maarch_entreprise/actions/validate_mail.php b/apps/maarch_entreprise/actions/validate_mail.php
index f77d50c978815871dc1982d25a10715d7873b7a1..04031182763dd429fb5f82e1e422fd8c97786949 100644
--- a/apps/maarch_entreprise/actions/validate_mail.php
+++ b/apps/maarch_entreprise/actions/validate_mail.php
@@ -1042,7 +1042,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module
$frm_str .= '<tr align="center">';
// HISTORY
- if ($core_tools->test_service('view_doc_history', 'apps', false)) {
+ if ($core_tools->test_service('view_doc_history', 'apps', false) || $core->test_service('view_full_history', 'apps', false)) {
$frm_str .= '<td>';
$pathScriptTab = $_SESSION['config']['businessappurl']
. 'index.php?display=true&page=show_history_tab&resId='
diff --git a/apps/maarch_entreprise/indexing_searching/details.php b/apps/maarch_entreprise/indexing_searching/details.php
index 6b5cb4a50a80ca2a3e021b365e2239dff8b64b97..61822bd0a3cdab8ce03bb381aa74e1db2032a393 100644
--- a/apps/maarch_entreprise/indexing_searching/details.php
+++ b/apps/maarch_entreprise/indexing_searching/details.php
@@ -117,7 +117,7 @@ if ($core->test_service('view_technical_infos', 'apps', false)) {
//test service view doc history
$viewDocHistory = false;
-if ($core->test_service('view_doc_history', 'apps', false)) {
+if ($core->test_service('view_doc_history', 'apps', false) || $core->test_service('view_full_history', 'apps', false)) {
$viewDocHistory = true;
}
diff --git a/apps/maarch_entreprise/js/functions.js b/apps/maarch_entreprise/js/functions.js
index b6633b9718fcf9d1497b19f6c3fb1078f19b0461..4e5a632e5c2e7bd4ae44de125c3a2072a9a22562 100755
--- a/apps/maarch_entreprise/js/functions.js
+++ b/apps/maarch_entreprise/js/functions.js
@@ -3362,6 +3362,10 @@ function loadToolbarBadge(targetTab,path_manage_script){
});
}
+function resetSelect(id) {
+ $j('#'+id).val("");
+ Event.fire($(id), "chosen:updated");
+}
// Exemple appel service
// function testService(){
diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php
index ffeddeb1e7b304966e169032734ac203fbe23513..7682fb4692fe42bd8979a58d6974f116dee5e4bc 100644
--- a/apps/maarch_entreprise/lang/en.php
+++ b/apps/maarch_entreprise/lang/en.php
@@ -44,6 +44,7 @@ if (!defined("_ADMIN_ARCHITECTURE_DESC")) define("_ADMIN_ARCHITECTURE_DESC",
if (!defined("_VIEW_HISTORY")) define("_VIEW_HISTORY", "History");
if (!defined("_VIEW_HISTORY_BATCH")) define("_VIEW_HISTORY_BATCH", "Batch history");
if (!defined("_VIEW_HISTORY_DESC")) define("_VIEW_HISTORY_DESC", "Read the events history linked to the utilisation of Maarch GED.");
+if (!defined("_VIEW_FULL_HISTORY_DESC")) define("_VIEW_FULL_HISTORY_DESC", "Read the full events history linked to the utilisation of Maarch GED.");
if (!defined("_VIEW_HISTORY_BATCH_DESC")) define("_VIEW_HISTORY_BATCH_DESC", "Read batch history");
if (!defined("_ADMIN_MODULES")) define("_ADMIN_MODULES", "Manage the modules");
if (!defined("_ADMIN_SERVICE")) define("_ADMIN_SERVICE", "Administration department");
@@ -1719,7 +1720,8 @@ if (!defined("_CHOOSE_CATEGORY_ASSOCIATION")) define("_CHOOSE_CATEGORY_ASSOCIATI
if (!defined("_CHOOSE_CATEGORY_ASSOCIATION_HELP")) define("_CHOOSE_CATEGORY_ASSOCIATION_HELP", "If there is no selected category, then the action is available for all categories");
//SERVICE VIEW DOC HISTORY
-if (!defined("_VIEW_DOC_HISTORY")) define("_VIEW_DOC_HISTORY", "See document history");
+if (!defined("_VIEW_DOC_HISTORY")) define("_VIEW_DOC_HISTORY", "See global document history");
+if (!defined("_VIEW_FULL_HISTORY")) define("_VIEW_FULL_HISTORY", "See Full document history");
//ONLY ALPHANUM
if (!defined("_ONLY_ALPHANUM")) define("_ONLY_ALPHANUM", "Only alphanumeric characters are accepted");
@@ -1811,4 +1813,6 @@ if (!defined("_FINAL_DISPOSITION")) define("_FINAL_DISPOSITION","Final dispositi
if (!defined("_CHOOSE_FINAL_DISPOSITION")) define("_CHOOSE_FINAL_DISPOSITION","choose final disposition");
if (!defined("_DESTROY")) define("_DESTROY","Destroy");
if (!defined("_KEEP")) define("_KEEP","Keep");
-if (!defined("_RETENTION_RULE")) define("_RETENTION_RULE","Retention rule");
\ No newline at end of file
+if (!defined("_RETENTION_RULE")) define("_RETENTION_RULE","Retention rule");
+
+if (!defined("_UNSELECT_ALL")) define("_UNSELECT_ALL","Unselect all");
diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php
index f0c63fff6f41a59a8e88efff393920a9ea761b61..c9f73edcfc2856e3f7a5fc775540385ec1d2dcc8 100755
--- a/apps/maarch_entreprise/lang/fr.php
+++ b/apps/maarch_entreprise/lang/fr.php
@@ -45,6 +45,7 @@ if (!defined("_ADMIN_ARCHITECTURE_DESC")) define("_ADMIN_ARCHITECTURE_DESC",
if (!defined("_VIEW_HISTORY")) define("_VIEW_HISTORY", "Historique");
if (!defined("_VIEW_HISTORY_BATCH")) define("_VIEW_HISTORY_BATCH", "Historique des batchs");
if (!defined("_VIEW_HISTORY_DESC")) define("_VIEW_HISTORY_DESC", "Consulter l'historique des événements relatifs à l'utilisation de la GED Maarch.");
+if (!defined("_VIEW_FULL_HISTORY_DESC")) define("_VIEW_FULL_HISTORY_DESC", "Consulter l'historique complet des événements relatifs à l'utilisation de la GED Maarch.");
if (!defined("_VIEW_HISTORY_BATCH_DESC")) define("_VIEW_HISTORY_BATCH_DESC", "Consulter l'historique des batchs");
if (!defined("_ADMIN_MODULES")) define("_ADMIN_MODULES", "Gérer les modules");
if (!defined("_ADMIN_SERVICE")) define("_ADMIN_SERVICE", "Service d'administration");
@@ -1719,7 +1720,8 @@ if (!defined("_CHOOSE_CATEGORY_ASSOCIATION")) define("_CHOOSE_CATEGORY_ASSOCIATI
if (!defined("_CHOOSE_CATEGORY_ASSOCIATION_HELP")) define("_CHOOSE_CATEGORY_ASSOCIATION_HELP", "Si aucune catégorie sélectionnée alors l'action est valable pour toute les catégories");
//SERVICE VIEW DOC HISTORY
-if (!defined("_VIEW_DOC_HISTORY")) define("_VIEW_DOC_HISTORY", "Voir l'historique du document");
+if (!defined("_VIEW_DOC_HISTORY")) define("_VIEW_DOC_HISTORY", "Voir l'historique global du document");
+if (!defined("_VIEW_FULL_HISTORY")) define("_VIEW_FULL_HISTORY", "Voir l'historique complet du document");
//ONLY ALPHANUM
if (!defined("_ONLY_ALPHANUM")) define("_ONLY_ALPHANUM", "Seuls les caractères alphanumériques sont acceptés");
@@ -1816,3 +1818,5 @@ if (!defined("_CHOOSE_FINAL_DISPOSITION")) define("_CHOOSE_FINAL_DISPOSITION","C
if (!defined("_DESTROY")) define("_DESTROY","Destruction");
if (!defined("_KEEP")) define("_KEEP","Conservation");
if (!defined("_RETENTION_RULE")) define("_RETENTION_RULE","Règle de retention");
+
+if (!defined("_UNSELECT_ALL")) define("_UNSELECT_ALL","Tout désélectionner");
diff --git a/apps/maarch_entreprise/show_history_tab.php b/apps/maarch_entreprise/show_history_tab.php
index 936330179e1d56b2416630a523ca880cc233da12..cd8f0b3d0256fecdb862e3951328c99833f59784 100644
--- a/apps/maarch_entreprise/show_history_tab.php
+++ b/apps/maarch_entreprise/show_history_tab.php
@@ -18,24 +18,35 @@ $core_tools->load_html();
$core_tools->load_header('', true, false);
$core_tools->load_js();
-$frm_str .= '<iframe src="'
- . $_SESSION['config']['businessappurl']
- . 'index.php?display=true&dir=indexing_searching&page=document_workflow_history&id='
- . $res_id . '&coll_id=' . $coll_id . '&load&size=medium" '
- . 'name="hist_wf_doc_process" id="hist_wf_doc_process" width="100%" height="500px" align="center" '
- . 'scrolling="auto" frameborder="0" style="height: 500px; max-height: 500px; overflow: scroll;"></iframe>';
-
-$frm_str .= '<br/>';
-
-$frm_str .= '<span style="cursor: pointer;" onmouseover="this.style.cursor=\'pointer\';" onclick="new Effect.toggle(\'hist_doc_process\', \'blind\', {delay:0.2});whatIsTheDivStatus(\'hist_doc_process\', \'divStatus_all_history_div\');return false;">'
- . '<span id="divStatus_all_history_div" style="color:#1C99C5;"><i class="fa fa-plus-square-o"></i></span>'
- . '<b> ' . _ALL_HISTORY . '</b>'
- . '</span>';
-$frm_str .= '<iframe src="'
- . $_SESSION['config']['businessappurl']
- . 'index.php?display=true&dir=indexing_searching&page=document_history&id='
- . $res_id . '&coll_id=' . $coll_id . '&load&size=medium" '
- . 'name="hist_doc_process" id="hist_doc_process" width="100%" height="650px" align="center" '
- . 'scrolling="auto" frameborder="0" style="height: 650px; max-height: 650px; overflow: scroll;display:none;" ></iframe>';
+if ($core->test_service('view_doc_history', 'apps', false)) {
+ $frm_str .= '<iframe src="'
+ . $_SESSION['config']['businessappurl']
+ . 'index.php?display=true&dir=indexing_searching&page=document_workflow_history&id='
+ . $res_id . '&coll_id=' . $coll_id . '&load&size=medium" '
+ . 'name="hist_wf_doc_process" id="hist_wf_doc_process" width="100%" height="500px" align="center" '
+ . 'scrolling="auto" frameborder="0" style="height: 500px; max-height: 500px; overflow: scroll;"></iframe>';
+
+ $frm_str .= '<br/>';
+}
+if ($core->test_service('view_full_history', 'apps', false)) {
+ $frm_str .= '<span style="cursor: pointer;" onmouseover="this.style.cursor=\'pointer\';" onclick="new Effect.toggle(\'hist_doc_process\', \'blind\', {delay:0.2});whatIsTheDivStatus(\'hist_doc_process\', \'divStatus_all_history_div\');return false;">';
+ if ($core->test_service('view_doc_history', 'apps', false)) {
+ $frm_str .= '<span id="divStatus_all_history_div" style="color:#1C99C5;"><i class="fa fa-plus-square-o"></i></span>';
+ } else {
+ $frm_str .= '<span id="divStatus_all_history_div" style="color:#1C99C5;"><i class="fa fa-minus-square-o"></i></span>';
+ }
+ $frm_str .= '<b> ' . _ALL_HISTORY . '</b>' . '</span>';
+ $frm_str .= '<iframe src="'
+ . $_SESSION['config']['businessappurl']
+ . 'index.php?display=true&dir=indexing_searching&page=document_history&id='
+ . $res_id . '&coll_id=' . $coll_id . '&load&size=medium" '
+ . 'name="hist_doc_process" id="hist_doc_process" width="100%" height="650px" align="center" '
+ . 'scrolling="auto" frameborder="0" style="height: 650px; max-height: 650px; overflow: scroll;';
+ if ($core->test_service('view_doc_history', 'apps', false)) {
+ $frm_str .= 'display: none" ></iframe>';
+ } else {
+ $frm_str .= '" ></iframe>';
+ }
+}
echo $frm_str;
\ No newline at end of file
diff --git a/apps/maarch_entreprise/xml/services.xml b/apps/maarch_entreprise/xml/services.xml
index 760f073b49ba193f6a69d4eb4987cc3233959167..5c3a87b6c9945142763bef4c1f1edc4542650de1 100644
--- a/apps/maarch_entreprise/xml/services.xml
+++ b/apps/maarch_entreprise/xml/services.xml
@@ -239,20 +239,32 @@
<nature>include</nature>
</WHEREAMIUSED>
</SERVICE>
- <SERVICE>
- <id>view_doc_history</id>
- <name>_VIEW_DOC_HISTORY</name>
- <comment>_VIEW_HISTORY_DESC</comment>
- <!-- <servicepage>index.php?page=history&admin=history</servicepage> -->
- <servicetype>use</servicetype>
- <system_service>false</system_service>
- <!-- <style>view_history</style> -->
- <enabled>true</enabled>
- <WHEREAMIUSED>
- <page>details.php</page>
- <!-- <nature>include</nature> -->
- </WHEREAMIUSED>
- </SERVICE>
+ <SERVICE>
+ <id>view_doc_history</id>
+ <name>_VIEW_DOC_HISTORY</name>
+ <comment>_VIEW_HISTORY_DESC</comment>
+ <!-- <servicepage>index.php?page=history&admin=history</servicepage> -->
+ <servicetype>use</servicetype>
+ <system_service>false</system_service>
+ <!-- <style>view_history</style> -->
+ <enabled>true</enabled>
+ <WHEREAMIUSED>
+ <page>details.php</page>
+ <!-- <nature>include</nature> -->
+ </WHEREAMIUSED>
+ </SERVICE>
+ <SERVICE>
+ <id>view_full_history</id>
+ <name>_VIEW_FULL_HISTORY</name>
+ <comment>_VIEW_FULL_HISTORY_DESC</comment>
+ <servicetype>use</servicetype>
+ <system_service>false</system_service>
+ <enabled>true</enabled>
+ <WHEREAMIUSED>
+ <page>details.php</page>
+ <!-- <nature>include</nature> -->
+ </WHEREAMIUSED>
+ </SERVICE>
<SERVICE>
<id>put_in_validation</id>
<name>_PUT_DOC_ON_VALIDATION_FROM_DETAILS</name>
diff --git a/modules/avis/js/functions.js b/modules/avis/js/functions.js
index 6e2ccdcf10db760bf754bca808b86753f8c41d53..3fc74f11b415b452ef92cd926cb41747dcd59387 100755
--- a/modules/avis/js/functions.js
+++ b/modules/avis/js/functions.js
@@ -277,6 +277,14 @@ function initDragNDropAvis() {
}
});
+ $j('#avis_content')
+ .on('focus', '.consigne', function(e) {
+ $j(this).closest('.droptarget').attr("draggable", false);
+ console.log($j(this).closest('.droptarget'));
+ })
+ .on('blur', '.consigne', function(e) {
+ $j(this).closest('.droptarget').attr("draggable", true);
+ });
}
function checkRealDateAvis() {
diff --git a/modules/notes/notes.php b/modules/notes/notes.php
index c93db06fbe643f189ce4b73aa47d510b4d63342f..685fc1f2f0b2db130c8409a3a717e0df2ef7ed8d 100644
--- a/modules/notes/notes.php
+++ b/modules/notes/notes.php
@@ -261,7 +261,12 @@ if (isset($_REQUEST['load'])) {
if (!empty($tabEntityLabel)) {
$allEntities = implode(' - ', $tabEntityLabel);
- $allEntitiesId = implode('<br/>', $tabEntityId);
+ if(count($tabEntityId) > 3){
+ $allEntitiesId = $tabEntityId[0] .'<br/>'.$tabEntityId[1].'<br/>'.$tabEntityId[2].'<br/>...';
+ }else{
+ $allEntitiesId = implode('<br/>', $tabEntityId);
+ }
+
}
diff --git a/modules/tags/manage_tag_list.php b/modules/tags/manage_tag_list.php
index 31333df902b040cdb586bc4bb71052a2545cbca3..6daa1beade9869ade9890e1112fb7ccc2f3d458f 100755
--- a/modules/tags/manage_tag_list.php
+++ b/modules/tags/manage_tag_list.php
@@ -1,36 +1,14 @@
<?php
-/*
-* Copyright 2008,2014 Maarch
-*
-* This file is part of Maarch Framework.
-*
-* Maarch Framework is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Maarch Framework is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with Maarch Framework. If not, see <http://www.gnu.org/licenses/>.
-*/
-
/**
-* Module : Tags
-*
-* This module is used to store ressources with any keywords
-* V: 1.0
-*
-* @file
-* @author Loic Vinet
-* @date $date$
-* @version $Revision$
+* Copyright Maarch since 2008 under licence GPLv3.
+* See LICENCE.txt file at the root folder for more details.
+* This file is part of Maarch software.
+
+* @brief managage_tag_list
+* @author dev <dev@maarch.org>
+* @ingroup tags
*/
-/* Affichage */
if ($mode == 'list') {
$list = new list_show();
$list->admin_list(
@@ -39,7 +17,8 @@ if ($mode == 'list') {
$tagslist['title'],
'tag_label',
'manage_tag_list_controller&mode=list',
- 'tags','tag_id',
+ 'tags',
+ 'tag_id',
true,
$tagslist['page_name_up'],
$tagslist['page_name_val'],
@@ -165,6 +144,7 @@ if ($mode == 'list') {
}
$content .= '</select>';
+ $content .= '<p style="text-align: right;margin-right: 20px;"><a style="cursor: pointer;" onclick="resetSelect(\'entitieslist\')">'._UNSELECT_ALL.'</a></p>';
$content .= '<script>new Chosen($(\'entitieslist\'),{width: "95%", disable_search_threshold: 10, search_contains: true,display_disabled_options: false});</script>';
echo $content;
?>
diff --git a/modules/visa/js/functions.js b/modules/visa/js/functions.js
index 42c7b572820f8db3c2716ae552f581fad1950173..73f9de300057e354ded8be42f6965f4689eadecb 100644
--- a/modules/visa/js/functions.js
+++ b/modules/visa/js/functions.js
@@ -282,6 +282,14 @@ function initDragNDropVisa() {
}
});
+ $j('#visa_content')
+ .on('focus', '.consigne', function(e) {
+ $j(this).closest('.droptarget').attr("draggable", false);
+ console.log($j(this).closest('.droptarget'));
+ })
+ .on('blur', '.consigne', function(e) {
+ $j(this).closest('.droptarget').attr("draggable", true);
+ });
}
function manageFrame(button) {