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

Fixes #546 - vt7: Unable to open the Mail Converter from the menu

parent 10c347f4
No related branches found
No related tags found
1 merge request!210Fixes #546 - vt7: Unable to open the Mail Converter from the menu
......@@ -22,7 +22,9 @@
{if $QUICK_PREVIEW_ENABLED eq 'true'}
<span class="quickView fa fa-eye icon action" title="{vtranslate('LBL_QUICK_VIEW', $MODULE)}"></span>
{/if}
<span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span>
{if $MODULE_MODEL->isStarredEnabled()}
<span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span>
{/if}
{assign var=EDIT_VIEW_URL value={$LISTVIEW_ENTRY->getEditViewUrl()}}
{if $IS_MODULE_EDITABLE && $EDIT_VIEW_URL && $LISTVIEW_ENTRY->get('taskstatus') neq vtranslate('Held', $MODULE) && $LISTVIEW_ENTRY->get('taskstatus') neq vtranslate('Completed', $MODULE)}
<span class="fa fa-check icon action" title="{vtranslate('LBL_MARK_AS_HELD', $MODULE)}" onclick="Calendar_Calendar_Js.markAsHeld('{$LISTVIEW_ENTRY->getId()}');"></span>
......
......@@ -20,7 +20,9 @@
{else}
{assign var=STARRED value=false}
{/if}
<span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span>
{if $MODULE_MODEL->isStarredEnabled()}
<span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span>
{/if}
<span class="more dropdown action">
<a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v icon"></i></a>
<ul class="dropdown-menu">
......
......@@ -23,7 +23,9 @@
{if $QUICK_PREVIEW_ENABLED eq 'true'}
<span class="quickView fa fa-eye icon action" data-app="{$SELECTED_MENU_CATEGORY}" title="{vtranslate('LBL_QUICK_VIEW', $MODULE)}"></span>
{/if}
<span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span>
{if $MODULE_MODEL->isStarredEnabled()}
<span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span>
{/if}
<span class="more dropdown action">
<span href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-ellipsis-v icon"></i></span>
......
......@@ -37,6 +37,7 @@ class Migration_Module_Model extends Vtiger_Module_Model {
array('650' => '6.5.0'),
array('660' => '6.6.0'),
array('700' => '7.0.0'),
array('701' => '7.0.1'),
);
return $versions;
}
......
<?php
/*+********************************************************************************
* The contents of this file are subject to the vtiger CRM Public License Version 1.0
* ("License"); You may not use this file except in compliance with the License
* The Original Code is: vtiger CRM Open Source
* The Initial Developer of the Original Code is vtiger.
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
*********************************************************************************/
if(defined('VTIGER_UPGRADE')) {
global $adb, $current_user;
$db = PearDatabase::getInstance();
if (!Vtiger_Utils::CheckTable('vtiger_mailscanner')) {
Vtiger_Utils::CreateTable('vtiger_mailscanner',
"(`scannerid` INT(11) NOT NULL AUTO_INCREMENT,
`scannername` VARCHAR(30) DEFAULT NULL,
`server` VARCHAR(100) DEFAULT NULL,
`protocol` VARCHAR(10) DEFAULT NULL,
`username` VARCHAR(255) DEFAULT NULL,
`password` VARCHAR(255) DEFAULT NULL,
`ssltype` VARCHAR(10) DEFAULT NULL,
`sslmethod` VARCHAR(30) DEFAULT NULL,
`connecturl` VARCHAR(255) DEFAULT NULL,
`searchfor` VARCHAR(10) DEFAULT NULL,
`markas` VARCHAR(10) DEFAULT NULL,
`isvalid` INT(1) DEFAULT NULL,
`scanfrom` VARCHAR(10) DEFAULT 'ALL',
`time_zone` VARCHAR(10) DEFAULT NULL,
PRIMARY KEY (`scannerid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8", true);
}
}
\ No newline at end of file
......@@ -92,6 +92,8 @@ class Settings_MailConverter_Field_Model extends Vtiger_Field_Model {
}
return $this->isEditable;
}
public function getPicklistColors() {
return array();
}
}
\ No newline at end of file
......@@ -8,7 +8,7 @@
* All Rights Reserved.
************************************************************************************/
$patch_version = '20170523'; // -ve timestamp before release, +ve timestamp after release.
$patch_version = '20170525'; // -ve timestamp before release, +ve timestamp after release.
$modified_database = '';
$vtiger_current_version = '7.0.0';
$_SESSION['vtiger_version'] = $vtiger_current_version;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment