diff --git a/layouts/v7/modules/Documents/DocumentsRelatedList.tpl b/layouts/v7/modules/Documents/DocumentsRelatedList.tpl index 830d094a601227549b53c5f79b43640dfde6215b..46fce2d8b1a90483f01aacea1b4d2e0f797ac75a 100644 --- a/layouts/v7/modules/Documents/DocumentsRelatedList.tpl +++ b/layouts/v7/modules/Documents/DocumentsRelatedList.tpl @@ -27,8 +27,8 @@ <div class="col-lg-6 col-md-6 col-sm-6 btn-toolbar"> <div class="row"> {foreach item=RELATED_LINK from=$RELATED_LIST_LINKS['LISTVIEWBASIC']} - - {if $RELATED_LINK->getLabel() eq 'Select Document'} + + {if $RELATED_LINK->get('linkmodule') eq 'Documents'} <div class="col-sm-3"> {assign var=IS_SELECT_BUTTON value={$RELATED_LINK->get('_selectRelation')}} {* setting button module attribute to Events or Calendar based on link label *} diff --git a/modules/Documents/views/InRelation.php b/modules/Documents/views/InRelation.php index 5789605e774c1c0d44842b3347a6c68c242b24b8..37a68afa0603e9acee41865019de3facd4eca33e 100644 --- a/modules/Documents/views/InRelation.php +++ b/modules/Documents/views/InRelation.php @@ -125,6 +125,7 @@ class Documents_InRelation_View extends Vtiger_RelatedList_View { $viewer->assign('IS_EDITABLE', $relationModel->isEditable()); $viewer->assign('IS_DELETABLE', $relationModel->isDeletable()); $viewer->assign('USER_MODEL', Users_Record_Model::getCurrentUserModel()); + $viewer->assign('IS_CREATE_PERMITTED', $relatedModuleModel->isPermitted('CreateView')); $viewer->assign('VIEW', $request->get('view')); $viewer->assign('PARENT_ID', $parentId); $viewer->assign('SEARCH_DETAILS', $searchParams); diff --git a/modules/Settings/MenuEditor/actions/SaveAjax.php b/modules/Settings/MenuEditor/actions/SaveAjax.php index a043144b483bcf6b81d2c664785263a2c2890852..1bb2b3d90dfa368e63ecd9af5b1a32e2fc362090 100644 --- a/modules/Settings/MenuEditor/actions/SaveAjax.php +++ b/modules/Settings/MenuEditor/actions/SaveAjax.php @@ -58,11 +58,7 @@ Class Settings_MenuEditor_SaveAjax_Action extends Settings_Vtiger_IndexAjax_View $db = PearDatabase::getInstance(); foreach ($moduleSequence as $moduleName => $sequence) { $moduleModel = Vtiger_Module_Model::getInstance($moduleName); - if ($moduleModel->get('source') == 'custom') { - $db->pquery('UPDATE vtiger_app2tab SET sequence = ?, appname = ? WHERE tabid = ?', array($sequence, $appName, $moduleModel->getId())); - } else { - $db->pquery('UPDATE vtiger_app2tab SET sequence = ? WHERE tabid = ? AND appname = ?', array($sequence, $moduleModel->getId(), $appName)); - } + $db->pquery('UPDATE vtiger_app2tab SET sequence = ? WHERE tabid = ? AND appname = ?', array($sequence, $moduleModel->getId(), $appName)); } $response = new Vtiger_Response(); diff --git a/modules/Vtiger/models/RelationListView.php b/modules/Vtiger/models/RelationListView.php index 35f99ca4703fb431b7ad717522c159216ef7ae20..b7d00bea3154b837f619beea5eed1f7fb9d7f230 100644 --- a/modules/Vtiger/models/RelationListView.php +++ b/modules/Vtiger/models/RelationListView.php @@ -156,6 +156,7 @@ class Vtiger_RelationListView_Model extends Vtiger_Base_Model { 'linklabel' => vtranslate('LBL_SELECT')." ".vtranslate('SINGLE_'.$relatedModel->getName(), $relatedModel->getName()), 'linkurl' => '', 'linkicon' => '', + 'linkmodule' => $relatedModel->getName(), ) );