Skip to content
Snippets Groups Projects
Commit 14622c9b authored by Satish's avatar Satish
Browse files

Fixes #551 - vt7: Extension banner show also 6.x extension

parent 4e43ed52
No related branches found
No related tags found
No related merge requests found
...@@ -16,11 +16,16 @@ ...@@ -16,11 +16,16 @@
<table border="0" cellpadding="5" cellspacing="0" width="98%"> <table border="0" cellpadding="5" cellspacing="0" width="98%">
<tbody> <tbody>
<tr> <tr>
<td rowspan="2" width="10%"><img src="{vimage_path("denied.gif")}" style="margin: 10px;"></td> <td rowspan="2"><img src="{vimage_path("denied.gif")}" style="margin: 10px;"></td>
<td rowspan="2" width="40%" style="border-bottom: 1px solid rgb(204, 204, 204);"> <td width="80%" style="border-bottom: 1px solid rgb(204, 204, 204);">
<span class="genHeaderSmall"><b>{vtranslate($EXTENSION_LABEL, $QUALIFIED_MODULE)}</b> {vtranslate('LBL_EXTENSION_NOT_COMPATABLE', $QUALIFIED_MODULE)}</span> <span class="genHeaderSmall"><b>{vtranslate($EXTENSION_LABEL, $QUALIFIED_MODULE)}</b> {vtranslate('LBL_EXTENSION_NOT_COMPATABLE', $QUALIFIED_MODULE)}</span>
</td> </td>
</tr> </tr>
<tr>
<td class="small" align="right" nowrap="nowrap">
<a href="index.php?module=ExtensionStore&parent=Settings&view=ExtensionStore">{vtranslate('LBL_GO_BACK', $MODULE)}</a><br>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
... ...
......
No preview for this file type
...@@ -132,6 +132,9 @@ class Settings_ExtensionStore_ExtensionStore_View extends Settings_Vtiger_Index_ ...@@ -132,6 +132,9 @@ class Settings_ExtensionStore_ExtensionStore_View extends Settings_Vtiger_Index_
$modelInstance = $this->getModelInstance(); $modelInstance = $this->getModelInstance();
$extensionDetail = $modelInstance->getExtensionListings($extensionId); $extensionDetail = $modelInstance->getExtensionListings($extensionId);
$extension = $extensionDetail[$extensionId];
if ($extension && $extension->isVtigerCompatible()) {
$customerReviews = $modelInstance->getCustomerReviews($extensionId); $customerReviews = $modelInstance->getCustomerReviews($extensionId);
$screenShots = $modelInstance->getScreenShots($extensionId); $screenShots = $modelInstance->getScreenShots($extensionId);
$authorInfo = $modelInstance->getListingAuthor($extensionId); $authorInfo = $modelInstance->getListingAuthor($extensionId);
...@@ -159,7 +162,6 @@ class Settings_ExtensionStore_ExtensionStore_View extends Settings_Vtiger_Index_ ...@@ -159,7 +162,6 @@ class Settings_ExtensionStore_ExtensionStore_View extends Settings_Vtiger_Index_
$viewer->assign('CUSTOMER_PROFILE', $customerProfile); $viewer->assign('CUSTOMER_PROFILE', $customerProfile);
} }
$extension = $extensionDetail[$extensionId];
$viewer->assign('IS_PRO', true); $viewer->assign('IS_PRO', true);
$viewer->assign('MODULE_ACTION', $moduleAction); $viewer->assign('MODULE_ACTION', $moduleAction);
$viewer->assign('SCREEN_SHOTS', $screenShots); $viewer->assign('SCREEN_SHOTS', $screenShots);
...@@ -171,6 +173,11 @@ class Settings_ExtensionStore_ExtensionStore_View extends Settings_Vtiger_Index_ ...@@ -171,6 +173,11 @@ class Settings_ExtensionStore_ExtensionStore_View extends Settings_Vtiger_Index_
$viewer->assign('QUALIFIED_MODULE', $qualifiedModuleName); $viewer->assign('QUALIFIED_MODULE', $qualifiedModuleName);
$viewer->assign('REGISTRATION_STATUS', $registrationStatus); $viewer->assign('REGISTRATION_STATUS', $registrationStatus);
$viewer->view('Detail.tpl', $qualifiedModuleName); $viewer->view('Detail.tpl', $qualifiedModuleName);
} else {
$viewer->assign('EXTENSION_LABEL', $extension->get('label'));
$viewer->assign('QUALIFIED_MODULE', $qualifiedModuleName);
$viewer->view('ExtensionCompatibleError.tpl', $qualifiedModuleName);
}
} }
protected function installationLog(Vtiger_Request $request) { protected function installationLog(Vtiger_Request $request) {
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment