From 9ffb085658761d3c01e2a768c6c47ef61427044d Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Sun, 2 May 2010 18:42:49 +0000 Subject: [PATCH] - Creation and CSV import de-activated for abstract classes SVN:trunk[390] --- application/displayblock.class.inc.php | 10 +++++----- pages/csvimport.php | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index 5cb3db539..388b679ab 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -869,16 +869,16 @@ class MenuBlock extends DisplayBlock { case 0: // No object in the set, the only possible action is "new" - $bIsModifyAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY); + $bIsModifyAllowed = (!MetaModel::IsAbstract($sClass)) && UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY); if ($bIsModifyAllowed) { $aActions[] = array ('label' => Dict::S('UI:Menu:New'), 'url' => "../page/$sUIPage?operation=new&class=$sClass&$sContext{$sDefault}"); } break; case 1: $oObj = $oSet->Fetch(); $id = $oObj->GetKey(); - $bIsModifyAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, $oSet); + $bIsModifyAllowed = (!MetaModel::IsAbstract($sClass)) && UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, $oSet); $bIsDeleteAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_DELETE, $oSet); - $bIsBulkModifyAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_MODIFY, $oSet); + $bIsBulkModifyAllowed = (!MetaModel::IsAbstract($sClass)) && UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_MODIFY, $oSet); $bIsBulkDeleteAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_DELETE, $oSet); // Just one object in the set, possible actions are "new / clone / modify and delete" if (isset($aExtraParams['link_attr'])) @@ -927,8 +927,8 @@ class MenuBlock extends DisplayBlock default: // Check rights // New / Modify - $bIsModifyAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, $oSet); - $bIsBulkModifyAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_MODIFY, $oSet); + $bIsModifyAllowed = (!MetaModel::IsAbstract($sClass)) && UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, $oSet); + $bIsBulkModifyAllowed = (!MetaModel::IsAbstract($sClass)) && UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_MODIFY, $oSet); $bIsBulkDeleteAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_DELETE, $oSet); if (isset($aExtraParams['link_attr'])) { diff --git a/pages/csvimport.php b/pages/csvimport.php index ddca29a4e..8ed3600b0 100644 --- a/pages/csvimport.php +++ b/pages/csvimport.php @@ -40,7 +40,8 @@ function GetClassesSelect($sName, $sDefaultValue, $iWidthPx, $iActionCode = null $aValidClasses = array(); foreach(MetaModel::GetClasses('bizmodel') as $sClassName) { - if (is_null($iActionCode) || UserRights::IsActionAllowed($sClassName, $iActionCode)) + if ( (is_null($iActionCode) || UserRights::IsActionAllowed($sClassName, $iActionCode)) && + (!MetaModel::IsAbstract($sClassName)) ) { $sSelected = ($sClassName == $sDefaultValue) ? " selected" : ""; $sDescription = MetaModel::GetClassDescription($sClassName);