Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • vtiger/vtigercrm
  • varma/vtigercrm
  • alanbell/vtigercrm
  • mariusz.krzaczkowski/vtigercrm
  • manu.k/vtigercrm
  • adrgranado/vtigercrm
  • uma.s/vtigercrm
  • sardoj/vtigercrm
  • preexo/vtigercrm
  • david.valminos/vtigercrm
  • luca.saba/vtigercrm
  • dubwise/vtigercrm
  • valmir.ttcasolucoes/vtigercrm
  • lord_alan/vtigercrm
  • adrien.futschik/vtigercrm
  • edonit.rexhepi/vtigercrm
  • robert.heinze/vtigercrm
  • nrdimatteo/vtigercrm
  • sebastianzahan/vtigercrm
  • Miky/vtigercrm
  • germanf/vtigercrm
  • bernhardkau1/vtigercrm
  • olegtsoy/vtigercrm
  • grandel/vtigercrm
  • mario.thummler/vtigercrm
  • sutharsan/vtigercrm
  • james.douglas/vtigercrm
  • vikas/vtigercrm
  • jeffmchristensen/vtigercrm
  • lukasz.g/vtigercrm
  • nicolas.gasnier/vtigercrm
  • hamish.theitcompany/vtigercrm
  • engrbm87/vtigercrm
  • Quoc/vtigercrm
  • peter.maria.engeli/vtigercrm
  • kiranraju.j/vtigercrm
  • manuel.lozano/vtigercrm
  • dhaupin/vtigercrm
  • Ragupathyranesh/vtigercrm
  • Stefanbauer/vtigercrm
  • ruben.estrada/vtigercrm
  • sg_mwi1/vtigercrm
  • khaluk/vtigercrm
  • franzfroemel/vtigercrm
  • milan9615/vtigercrm
  • carlos.martin/vtigercrm
  • cmaggi/vtigercrm
  • Soltoon.theLeader/vtigercrm
  • alex.kaplun/vtigercrm
  • navid.hosseini/vtigercrm
  • maie/vtigercrm
  • simonetravaglini/vtigercrm
  • bertrand.wattel/vtigercrm
  • balaji.m/vtigercrm
  • mclarke4/vtigercrm
  • lajeeshk/vtigercrm
  • liam/vtigercrm
  • novikov.sergey/vtigercrm
  • johnwayne.williamson/vtigercrm
  • florian.strahberger-schramm/vtigercrm
  • daniel.schaefer/vtigercrm
  • christopher.gunther/vtigercrm
  • adrien.faveraux/vtigercrm
  • carsten.brandt/vtigercrm
  • stephane.molano/vtigercrm
  • krastan.petrov/vtigercrm
  • alfredo.bravo/vtigercrm
  • flipflop.Joe/vtigercrm
  • mirko.stagni/vtigercrm
  • remigio.ruberto/vtigercrm
  • gautam.dhudashiya/vtigercrm
  • manish.devitechnosolutions1/vtigercrm
  • matinbeigi/vtigercrm
  • devs/vtigercrm
  • happy.dev/vtigercrm
  • m.gigon/vtigercrm
  • manuelmigone/vtigercrm
  • eduardo.gqf/vtigercrm
  • elsayedEl-araby/vtigercrm
  • mirza.mehran/vtigercrm
  • maurice.courtois/vtigercrm
  • zuhri.utama/vtigercrm
  • shilpa.k/vtigercrm
  • Ignazio/vtigercrm
  • code80team/vtigercrm
  • code80/vtigercrm
  • nilay.automatesmb/cache
  • greeshma.kk/vtigercrm
  • vijay.tilak/vtigercrm
  • Paolo.Palamini/vtigercrm
  • estevan/vtigercrm
  • mobilcmcdk/vtigercrm
  • massimiliano.vessi/vtigercrm
  • daniel.voelskow/vtigercrm
  • james1/vtigercrm
  • lokesh.s/vtigercrm
  • rdb/vtigercrm
  • neftaliyagua/vtigercrm
  • angelo.paglialonga/vtigercrm
  • webmarka/vtigercrm
  • javanile/vtigercrm
  • akshath/vtigercrm
  • Hemanth/vtigercrm
  • opencrmitalia/vtigercrm
  • direzione/vtigercrm
  • umadas306/vtigercrm
  • jd-wraptec/vtigercrm
  • felipe.camacho/vtigercrm
  • Martin.allen/vtigercrm
  • amit.r/vtigercrm
  • vicus/vtigercrm
  • dev.osmi/vtigercrm
  • laurent.guillout/vtigercrm
  • christian.blaeul/vtigercrm
  • ap.js100/vtigercrm
  • yoann.mourot/vtigercrm-temp
  • christian.cruz/vtigercrm
  • zyli/vtigercrm
  • kaushik.p/vtigercrm
  • Madhuk/vtigercrm
  • cinakzm/vtigercrm
  • raquel.martinez/vtigercrm
  • tosajibadhi/vtigercrm
  • melvin.i/vtigercrm-melvin
  • ashashingadia/vtigercrm
  • stefanwarnat/vtigercrm
  • saran.s/vtigercrm
  • eduardomozart/vtigercrm
  • Daniel.Lennartz1/vtigercrm
  • juergen.fassmann/vtigercrm
  • Michel.Ram/vtigercrm
  • vincenzo.bruno/vtigercrm
  • Hitesh.Solanki/vtigercrm
133 results
Show changes
Commits on Source (148)
Showing
with 132 additions and 177 deletions
...@@ -20,9 +20,6 @@ $PERFORMANCE_CONFIG = Array( ...@@ -20,9 +20,6 @@ $PERFORMANCE_CONFIG = Array(
// This avoids executing the SET NAMES SQL for each query! // This avoids executing the SET NAMES SQL for each query!
'DB_DEFAULT_CHARSET_UTF8' => true, 'DB_DEFAULT_CHARSET_UTF8' => true,
// Compute record change indication for each record shown on listview
'LISTVIEW_RECORD_CHANGE_INDICATOR' => false,
// Turn-off default sorting in ListView, could eat up time as data grows // Turn-off default sorting in ListView, could eat up time as data grows
'LISTVIEW_DEFAULT_SORTING' => false, 'LISTVIEW_DEFAULT_SORTING' => false,
...@@ -38,7 +35,5 @@ $PERFORMANCE_CONFIG = Array( ...@@ -38,7 +35,5 @@ $PERFORMANCE_CONFIG = Array(
// reduce number of ajax requests on home page, reduce this value if home page widget dont // reduce number of ajax requests on home page, reduce this value if home page widget dont
// show value. // show value.
'HOME_PAGE_WIDGET_GROUP_SIZE' => 12, 'HOME_PAGE_WIDGET_GROUP_SIZE' => 12,
//take backup legacy style, whenever an admin user logs out.
'LOGOUT_BACKUP' => true,
); );
?> ?>
\ No newline at end of file
...@@ -28,9 +28,6 @@ ini_set('memory_limit','512M'); ...@@ -28,9 +28,6 @@ ini_set('memory_limit','512M');
// show or hide calendar, world clock, calculator, chat and CKEditor // show or hide calendar, world clock, calculator, chat and CKEditor
// Do NOT remove the quotes if you set these to false! // Do NOT remove the quotes if you set these to false!
$CALENDAR_DISPLAY = 'true'; $CALENDAR_DISPLAY = 'true';
$WORLD_CLOCK_DISPLAY = 'true';
$CALCULATOR_DISPLAY = 'true';
$CHAT_DISPLAY = 'true';
$USE_RTE = 'true'; $USE_RTE = 'true';
// helpdesk support email id and support name (Example: 'support@vtiger.com' and 'vtiger support') // helpdesk support email id and support name (Example: 'support@vtiger.com' and 'vtiger support')
...@@ -116,16 +113,9 @@ $allow_exports = 'all'; ...@@ -116,16 +113,9 @@ $allow_exports = 'all';
// upload_badext default value = php, php3, php4, php5, pl, cgi, py, asp, cfm, js, vbs, html, htm // upload_badext default value = php, php3, php4, php5, pl, cgi, py, asp, cfm, js, vbs, html, htm
$upload_badext = array('php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py', 'asp', 'cfm', 'js', 'vbs', 'html', 'htm', 'exe', 'bin', 'bat', 'sh', 'dll', 'phps', 'phtml', 'xhtml', 'rb', 'msi', 'jsp', 'shtml', 'sth', 'shtm'); $upload_badext = array('php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py', 'asp', 'cfm', 'js', 'vbs', 'html', 'htm', 'exe', 'bin', 'bat', 'sh', 'dll', 'phps', 'phtml', 'xhtml', 'rb', 'msi', 'jsp', 'shtml', 'sth', 'shtm');
// full path to include directory including the trailing slash
// includeDirectory default value = $root_directory..'include/
$includeDirectory = $root_directory.'include/';
// list_max_entries_per_page default value = 20 // list_max_entries_per_page default value = 20
$list_max_entries_per_page = '20'; $list_max_entries_per_page = '20';
// limitpage_navigation default value = 5
$limitpage_navigation = '5';
// history_max_viewed default value = 5 // history_max_viewed default value = 5
$history_max_viewed = '5'; $history_max_viewed = '5';
...@@ -139,10 +129,6 @@ $default_action = 'index'; ...@@ -139,10 +129,6 @@ $default_action = 'index';
// default_theme default value = blue // default_theme default value = blue
$default_theme = 'softed'; $default_theme = 'softed';
// show or hide time to compose each page
// calculate_response_time default value = true
$calculate_response_time = true;
// default text that is placed initially in the login form for user name // default text that is placed initially in the login form for user name
// no default_user_name default value // no default_user_name default value
$default_user_name = ''; $default_user_name = '';
...@@ -154,12 +140,6 @@ $default_password = ''; ...@@ -154,12 +140,6 @@ $default_password = '';
// create user with default username and password // create user with default username and password
// create_default_user default value = false // create_default_user default value = false
$create_default_user = false; $create_default_user = false;
// default_user_is_admin default value = false
$default_user_is_admin = false;
// if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown
// disable_persistent_connections default value = false
$disable_persistent_connections = false;
//Master currency name //Master currency name
$currency_name = '_MASTER_CURRENCY_'; $currency_name = '_MASTER_CURRENCY_';
...@@ -172,13 +152,6 @@ $default_charset = '_VT_CHARSET_'; ...@@ -172,13 +152,6 @@ $default_charset = '_VT_CHARSET_';
// default_language default value = en_us // default_language default value = en_us
$default_language = '_VT_DEFAULT_LANGUAGE_'; $default_language = '_VT_DEFAULT_LANGUAGE_';
// add the language pack name to every translation string in the display.
// translation_string_prefix default value = false
$translation_string_prefix = false;
//Option to cache tabs permissions for speed.
$cache_tab_perms = true;
//Option to hide empty home blocks if no entries. //Option to hide empty home blocks if no entries.
$display_empty_home_blocks = false; $display_empty_home_blocks = false;
......
...@@ -85,7 +85,7 @@ class CRMEntity { ...@@ -85,7 +85,7 @@ class CRMEntity {
return; return;
} }
$userSpecificTableIgnoredModules = array("SMSNotifier", "ModComments"); $userSpecificTableIgnoredModules = array('SMSNotifier', 'PBXManager', 'ModComments');
if(in_array($moduleName, $userSpecificTableIgnoredModules)) return; if(in_array($moduleName, $userSpecificTableIgnoredModules)) return;
$userSpecificTable = Vtiger_Functions::getUserSpecificTableName($moduleName); $userSpecificTable = Vtiger_Functions::getUserSpecificTableName($moduleName);
...@@ -493,7 +493,7 @@ class CRMEntity { ...@@ -493,7 +493,7 @@ class CRMEntity {
} }
if (isset($this->column_fields[$fieldname])) { if (isset($this->column_fields[$fieldname])) {
if ($uitype == 56) { if ($uitype == 56) {
if ($this->column_fields[$fieldname] == 'on' || $this->column_fields[$fieldname] == 1) { if ($this->column_fields[$fieldname] === 'on' || $this->column_fields[$fieldname] == 1) {
$fldvalue = '1'; $fldvalue = '1';
} else { } else {
$fldvalue = '0'; $fldvalue = '0';
...@@ -3003,4 +3003,4 @@ class TrackableObject implements ArrayAccess, IteratorAggregate { ...@@ -3003,4 +3003,4 @@ class TrackableObject implements ArrayAccess, IteratorAggregate {
function getColumnFieldNames(){ function getColumnFieldNames(){
return array_keys($this->storage); return array_keys($this->storage);
} }
} }
\ No newline at end of file
...@@ -349,7 +349,10 @@ function __vtlib_get_modulevar_value($module, $varname) { ...@@ -349,7 +349,10 @@ function __vtlib_get_modulevar_value($module, $varname) {
'IsCustomModule'=>false, 'IsCustomModule'=>false,
'table_name' => 'vtiger_quotes', 'table_name' => 'vtiger_quotes',
'table_index'=> 'quoteid', 'table_index'=> 'quoteid',
'related_tables' => Array ('vtiger_account' => Array('accountid')), 'related_tables' => Array (
'vtiger_quotescf' => array('quoteid', 'vtiger_quotes', 'quoteid'),
'vtiger_account' => Array('accountid')
),
'popup_fields'=>Array('subject'), 'popup_fields'=>Array('subject'),
), ),
'SalesOrder'=> 'SalesOrder'=>
...@@ -357,7 +360,10 @@ function __vtlib_get_modulevar_value($module, $varname) { ...@@ -357,7 +360,10 @@ function __vtlib_get_modulevar_value($module, $varname) {
'IsCustomModule'=>false, 'IsCustomModule'=>false,
'table_name' => 'vtiger_salesorder', 'table_name' => 'vtiger_salesorder',
'table_index'=> 'salesorderid', 'table_index'=> 'salesorderid',
'related_tables'=> Array ('vtiger_account' => Array('accountid')), 'related_tables'=> Array (
'vtiger_salesordercf' => array('salesorderid', 'vtiger_salesorder', 'salesorderid'),
'vtiger_account' => Array('accountid')
),
'popup_fields'=>Array('subject'), 'popup_fields'=>Array('subject'),
), ),
'PurchaseOrder'=> 'PurchaseOrder'=>
...@@ -404,6 +410,9 @@ function __vtlib_get_modulevar_value($module, $varname) { ...@@ -404,6 +410,9 @@ function __vtlib_get_modulevar_value($module, $varname) {
'IsCustomModule'=>false, 'IsCustomModule'=>false,
'table_name' => 'vtiger_notes', 'table_name' => 'vtiger_notes',
'table_index'=> 'notesid', 'table_index'=> 'notesid',
'related_tables' => Array(
'vtiger_notescf' => Array('notesid', 'vtiger_notes', 'notesid')
),
), ),
'Products'=> 'Products'=>
Array( Array(
...@@ -427,6 +436,9 @@ function __vtlib_get_modulevar_value($module, $varname) { ...@@ -427,6 +436,9 @@ function __vtlib_get_modulevar_value($module, $varname) {
'table_name' => 'vtiger_vendor', 'table_name' => 'vtiger_vendor',
'table_index'=> 'vendorid', 'table_index'=> 'vendorid',
'popup_fields'=>Array('vendorname'), 'popup_fields'=>Array('vendorname'),
'related_tables'=> Array(
'vtiger_vendorcf' => Array('vendorid', 'vtiger_vendor', 'vendorid')
),
), ),
'Project' => 'Project' =>
Array( Array(
......
...@@ -334,7 +334,7 @@ function set_default_config(&$defaults) ...@@ -334,7 +334,7 @@ function set_default_config(&$defaults)
*/ */
function decide_to_html() { function decide_to_html() {
global $doconvert, $inUTF8, $default_charset; global $doconvert, $inUTF8, $default_charset;
$action = $_REQUEST['action']; $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
$inUTF8 = (strtoupper($default_charset) == 'UTF-8'); $inUTF8 = (strtoupper($default_charset) == 'UTF-8');
...@@ -2620,4 +2620,4 @@ function getDuplicatesPreventionMessage($moduleName, $duplicateRecordsList) { ...@@ -2620,4 +2620,4 @@ function getDuplicatesPreventionMessage($moduleName, $duplicateRecordsList) {
return $message; return $message;
} }
?> ?>
\ No newline at end of file
...@@ -147,7 +147,7 @@ class Vtiger_Language_Handler { ...@@ -147,7 +147,7 @@ class Vtiger_Language_Handler {
public static function getLanguage() { public static function getLanguage() {
$userModel = Users_Record_Model::getCurrentUserModel(); $userModel = Users_Record_Model::getCurrentUserModel();
$language = ''; $language = '';
if (!empty($userModel)) { if (!empty($userModel) && $userModel->has('language')) {
$language = $userModel->get('language'); $language = $userModel->get('language');
} }
return empty($language) ? vglobal('default_language') : $language; return empty($language) ? vglobal('default_language') : $language;
......
...@@ -1164,6 +1164,7 @@ $languageStrings = array( ...@@ -1164,6 +1164,7 @@ $languageStrings = array(
'LBL_MARKETING' => 'MARKETING', 'LBL_MARKETING' => 'MARKETING',
'LBL_SALES' => 'SALES', 'LBL_SALES' => 'SALES',
'LBL_PROJECT' => 'PROJECTS', 'LBL_PROJECT' => 'PROJECTS',
'LBL_TOOLS' => 'TOOLS',
'LBL_TAGS' => 'Tags', 'LBL_TAGS' => 'Tags',
'LBL_SHARE_TAGS' => 'Public Tags', 'LBL_SHARE_TAGS' => 'Public Tags',
'LBL_SHARE_TAG' => 'Shared Tag(s)', 'LBL_SHARE_TAG' => 'Shared Tag(s)',
...@@ -1936,4 +1937,5 @@ $jsLanguageStrings = array( ...@@ -1936,4 +1937,5 @@ $jsLanguageStrings = array(
'JS_SET_DEFAULT_TAB' => 'is set as your default dashboard', 'JS_SET_DEFAULT_TAB' => 'is set as your default dashboard',
'JS_PASSWORD_MISMATCH_ERROR' => 'Please re-enter passwords. The "new password" and "confirm password" values do not match.', 'JS_PASSWORD_MISMATCH_ERROR' => 'Please re-enter passwords. The "new password" and "confirm password" values do not match.',
'LBL_LIST_DELETE_CONFIRMATION' => 'Are you sure you want to delete?', 'LBL_LIST_DELETE_CONFIRMATION' => 'Are you sure you want to delete?',
'JS_WIDGET_RESIZING_WAIT_MSG' => 'Widget contents will load after resizing.',
); );
\ No newline at end of file
...@@ -6,13 +6,8 @@ ...@@ -6,13 +6,8 @@
* Portions created by vtiger are Copyright (C) vtiger. * Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved. * All Rights Reserved.
************************************************************************************} ************************************************************************************}
{assign var="APP_IMAGE_MAP" value=[
'MARKETING' => 'fa-users', {assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
'SALES' => 'fa-dot-circle-o',
'SUPPORT' => 'fa-life-ring',
'INVENTORY' => 'vicon-inventory',
'PROJECT' => 'fa-briefcase'
]}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}"> <div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
<div class="row" title="{strtoupper(vtranslate("LBL_CALENDAR",$MODULE))}"> <div class="row" title="{strtoupper(vtranslate("LBL_CALENDAR",$MODULE))}">
<span class="app-indicator-icon fa fa-calendar"></span> <span class="app-indicator-icon fa fa-calendar"></span>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</span> </span>
{/if} {/if}
<span class="more dropdown action"> <span class="more dropdown action">
<a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v icon"></i></a> <span class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v icon"></i></span>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a data-id="{$LISTVIEW_ENTRY->getId()}" href="{$LISTVIEW_ENTRY->getFullDetailViewUrl()}">{vtranslate('LBL_DETAILS', $MODULE)}</a></li> <li><a data-id="{$LISTVIEW_ENTRY->getId()}" href="{$LISTVIEW_ENTRY->getFullDetailViewUrl()}">{vtranslate('LBL_DETAILS', $MODULE)}</a></li>
{if $RECORD_ACTIONS} {if $RECORD_ACTIONS}
......
...@@ -6,13 +6,8 @@ ...@@ -6,13 +6,8 @@
* Portions created by vtiger are Copyright (C) vtiger. * Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved. * All Rights Reserved.
************************************************************************************} ************************************************************************************}
{assign var="APP_IMAGE_MAP" value=[
'MARKETING' => 'fa-users', {assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
'SALES' => 'fa-dot-circle-o',
'SUPPORT' => 'fa-life-ring',
'INVENTORY' => 'vicon-inventory',
'PROJECT' => 'fa-briefcase'
]}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY} moduleIcon"> <div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY} moduleIcon">
<div class="row" title="{vtranslate("Documents",$MODULE)}"> <div class="row" title="{vtranslate("Documents",$MODULE)}">
<span class="app-indicator-icon fa vicon-documents"></span> <span class="app-indicator-icon fa vicon-documents"></span>
......
...@@ -846,7 +846,7 @@ jQuery.Class("Emails_MassEdit_Js",{},{ ...@@ -846,7 +846,7 @@ jQuery.Class("Emails_MassEdit_Js",{},{
this.calculateUploadFileSize(); this.calculateUploadFileSize();
this.registerSaveDraftOrSendEmailEvent(); this.registerSaveDraftOrSendEmailEvent();
var isCkeditorApplied = jQuery('#description').data('isCkeditorApplied'); var isCkeditorApplied = jQuery('#description').data('isCkeditorApplied');
if(isCkeditorApplied != true){ if(isCkeditorApplied != true && jQuery('#description').length > 0){
this.loadCkEditor(jQuery('#description').data('isCkeditorApplied',true)); this.loadCkEditor(jQuery('#description').data('isCkeditorApplied',true));
} }
this.registerSelectEmailTemplateEvent(); this.registerSelectEmailTemplateEvent();
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<div class="banner"> <div class="banner">
<ul class="bxslider"> <ul class="bxslider">
{foreach $PROMOTIONS as $PROMOTION} {foreach $PROMOTIONS as $PROMOTION}
{if is_object($PROMOTION)}
<li> <li>
{assign var=SUMMARY value=$PROMOTION->get('summary')} {assign var=SUMMARY value=$PROMOTION->get('summary')}
{assign var=EXTENSION_NAME value=$PROMOTION->get('label')} {assign var=EXTENSION_NAME value=$PROMOTION->get('label')}
...@@ -26,8 +27,9 @@ ...@@ -26,8 +27,9 @@
{/if} {/if}
<a onclick="window.open('{$LOCATION_URL}')"><img src="{if $PROMOTION->get('bannerURL')}{$PROMOTION->get('bannerURL')}{/if}" title="{$PROMOTION->get('label')}" /></a> <a onclick="window.open('{$LOCATION_URL}')"><img src="{if $PROMOTION->get('bannerURL')}{$PROMOTION->get('bannerURL')}{/if}" title="{$PROMOTION->get('label')}" /></a>
</li> </li>
{/if}
{/foreach} {/foreach}
</ul> </ul>
</div> </div>
</div> </div>
{/strip} {/strip}
\ No newline at end of file
...@@ -19,9 +19,6 @@ mobileapp.controller('VtigerEditController', function ($scope, $api, $mdToast, $ ...@@ -19,9 +19,6 @@ mobileapp.controller('VtigerEditController', function ($scope, $api, $mdToast, $
if(newrecord){ if(newrecord){
if (typeof field.default != 'undefined') field.raw = field.default; if (typeof field.default != 'undefined') field.raw = field.default;
else if (typeof field.type.defaultValue != 'undefined') field.raw = field.type.defaultValue; else if (typeof field.type.defaultValue != 'undefined') field.raw = field.type.defaultValue;
// Special case
if (field.type.name == 'owner' && field.mandatory && !field.raw) { field.raw = "19x" + $scope.userinfo.id; }
} }
if(!newrecord && value){ if(!newrecord && value){
field.raw = value; field.raw = value;
...@@ -119,9 +116,13 @@ mobileapp.controller('VtigerEditController', function ($scope, $api, $mdToast, $ ...@@ -119,9 +116,13 @@ mobileapp.controller('VtigerEditController', function ($scope, $api, $mdToast, $
$scope.loadFields(); $scope.loadFields();
} }
else{ else{
$scope.$root.$on('UserInfo.Changed', function(){ if ($scope.userinfo) {
prepareCreateData(true); prepareCreateData(true);
}); } else {
$scope.$root.$on('UserInfo.Changed', function(){
prepareCreateData(true);
});
}
} }
}); });
...@@ -188,7 +189,7 @@ mobileapp.controller('VtigerEditController', function ($scope, $api, $mdToast, $ ...@@ -188,7 +189,7 @@ mobileapp.controller('VtigerEditController', function ($scope, $api, $mdToast, $
} }
var toast = $mdToast.simple().content(message).position($scope.getToastPosition()).hideDelay(1000); var toast = $mdToast.simple().content(message).position($scope.getToastPosition()).hideDelay(1000);
$mdToast.show(toast); $mdToast.show(toast);
window.location.href = "index.php?module="+$scope.module+"&view=List&app="+$scope.selectedApp; //window.location.href = "index.php?module="+$scope.module+"&view=List&app="+$scope.selectedApp;
} }
}); });
}; };
......
...@@ -6,24 +6,28 @@ ...@@ -6,24 +6,28 @@
* Portions created by vtiger are Copyright (C) vtiger. * Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved. * All Rights Reserved.
************************************************************************************} ************************************************************************************}
{* modules/Vtiger/views/Index.php *}
{* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *} {strip}
{include file="modules/Vtiger/partials/Topbar.tpl"} {include file="modules/Vtiger/partials/Topbar.tpl"}
<div class="container-fluid app-nav"> <div class="container-fluid app-nav">
<div class="row"> <div class="row">
{include file="modules/Portal/SidebarHeader.tpl"} {include file="modules/Portal/SidebarHeader.tpl"}
{include file="ModuleHeader.tpl"|vtemplate_path:$MODULE} {include file="ModuleHeader.tpl"|vtemplate_path:$MODULE}
</div> </div>
</div> </div>
</nav> </nav>
<div id='overlayPageContent' class='fade modal overlayPageContent content-area overlay-container-60' tabindex='-1' role='dialog' aria-hidden='true'> <div id='overlayPageContent' class='fade modal overlayPageContent content-area overlay-container-60' tabindex='-1' role='dialog' aria-hidden='true'>
<div class="data"> <div class="data">
</div> </div>
<div class="modal-dialog"> <div class="modal-dialog">
</div> </div>
</div> </div>
<div class="main-container main-container-{$MODULE}"> <div class="main-container main-container-{$MODULE}">
<div id="modnavigator" class="module-nav">
<div class="listViewPageDiv content-area full-width" id="listViewContent"> <div class="hidden-xs hidden-sm mod-switcher-container">
{include file="partials/Menubar.tpl"|vtemplate_path:$MODULE}
</div>
</div>
<div class="listViewPageDiv content-area full-width" id="listViewContent">
{/strip}
\ No newline at end of file
...@@ -10,6 +10,5 @@ ...@@ -10,6 +10,5 @@
{* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *} {* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
{strip} {strip}
<div class="col-sm-12 col-xs-12" id="portalListViewPage"> <div id="portalListViewPage">
{/strip}
{strip} \ No newline at end of file
\ No newline at end of file
...@@ -6,13 +6,8 @@ ...@@ -6,13 +6,8 @@
* Portions created by vtiger are Copyright (C) vtiger. * Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved. * All Rights Reserved.
************************************************************************************} ************************************************************************************}
{assign var="APP_IMAGE_MAP" value=[
'MARKETING' => 'fa-users', {assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
'SALES' => 'fa-dot-circle-o',
'SUPPORT' => 'fa-life-ring',
'INVENTORY' => 'vicon-inventory',
'PROJECT' => 'fa-briefcase'
]}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}"> <div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
<div class="row" title="{vtranslate("Portal",$MODULE)}"> <div class="row" title="{vtranslate("Portal",$MODULE)}">
<span class="app-indicator-icon fa fa-desktop"></span> <span class="app-indicator-icon fa fa-desktop"></span>
......
...@@ -6,14 +6,9 @@ ...@@ -6,14 +6,9 @@
* Portions created by vtiger are Copyright (C) vtiger. * Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved. * All Rights Reserved.
************************************************************************************} ************************************************************************************}
{assign var="APP_IMAGE_MAP" value=[
'MARKETING' => 'fa-users', {assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
'SALES' => 'fa-dot-circle-o',
'SUPPORT' => 'fa-life-ring',
'INVENTORY' => 'vicon-inventory',
'PROJECT' => 'fa-briefcase'
]}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}"> <div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
<div class="row" title="{strtoupper(vtranslate($MODULE, $MODULE))}"> <div class="row" title="{strtoupper(vtranslate($MODULE, $MODULE))}">
<span class="app-indicator-icon fa fa-bar-chart"></span> <span class="app-indicator-icon fa fa-bar-chart"></span>
......
{*+********************************************************************************** {*+**********************************************************************************
* The contents of this file are subject to the vtiger CRM Public License Version 1.1 * The contents of this file are subject to the vtiger CRM Public License Version 1.1
* ("License"); You may not use this file except in compliance with the License * ("License"); You may not use this file except in compliance with the License
* The Original Code is: vtiger CRM Open Source * The Original Code is: vtiger CRM Open Source
* The Initial Developer of the Original Code is vtiger. * The Initial Developer of the Original Code is vtiger.
* Portions created by vtiger are Copyright (C) vtiger. * Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved. * All Rights Reserved.
************************************************************************************} ************************************************************************************}
{* modules/Rss/views/List.php *} {* modules/Rss/views/List.php *}
{* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *} {* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
{strip} {strip}
<div class="listViewContentDiv" id="listViewContents"> <div class="listViewContentDiv" id="listViewContents">
<div class="col-sm-12 col-xs-12"> <div class="col-sm-12 col-xs-12">
{assign var=LEFTPANELHIDE value=$CURRENT_USER_MODEL->get('leftpanelhide')} {assign var=LEFTPANELHIDE value=$CURRENT_USER_MODEL->get('leftpanelhide')}
<div class="essentials-toggle" title="{vtranslate('LBL_LEFT_PANEL_SHOW_HIDE', 'Vtiger')}"> <div class="essentials-toggle" title="{vtranslate('LBL_LEFT_PANEL_SHOW_HIDE', 'Vtiger')}">
<span class="essentials-toggle-marker fa {if $LEFTPANELHIDE eq '1'}fa-chevron-right{else}fa-chevron-left{/if} cursorPointer"></span> <span class="essentials-toggle-marker fa {if $LEFTPANELHIDE eq '1'}fa-chevron-right{else}fa-chevron-left{/if} cursorPointer"></span>
</div> </div>
<input type="hidden" id="sourceModule" value="{$SOURCE_MODULE}" /> <input type="hidden" id="sourceModule" value="{$SOURCE_MODULE}" />
<div class="listViewEntriesDiv"> <div class="listViewEntriesDiv">
<span class="listViewLoadingImageBlock hide modal" id="loadingListViewModal"> <span class="listViewLoadingImageBlock hide modal" id="loadingListViewModal">
<img class="listViewLoadingImage" src="{vimage_path('loading.gif')}" alt="no-image" title="{vtranslate('LBL_LOADING', $MODULE)}"/> <img class="listViewLoadingImage" src="{vimage_path('loading.gif')}" alt="no-image" title="{vtranslate('LBL_LOADING', $MODULE)}"/>
<p class="listViewLoadingMsg">{vtranslate('LBL_LOADING_LISTVIEW_CONTENTS', $MODULE)}........</p> <p class="listViewLoadingMsg">{vtranslate('LBL_LOADING_LISTVIEW_CONTENTS', $MODULE)}........</p>
</span> </span>
<div class="feedContainer"> <div class="feedContainer">
{if $RECORD} {if $RECORD}
<input id="recordId" type="hidden" value="{$RECORD->getId()}"> <input id="recordId" type="hidden" value="{$RECORD->getId()}">
<div class="row-fluid"> <div class="row-fluid detailViewButtoncontainer">
<span class="btn-toolbar pull-right"> <span class="btn-toolbar pull-right">
<span class="btn-group"> <span class="btn-group">
<button id="deleteButton" class="btn btn-default">&nbsp;<strong>{vtranslate('LBL_DELETE', $MODULE)}</strong></button> <button id="deleteButton" class="btn btn-default">&nbsp;{vtranslate('LBL_DELETE', $MODULE)}</button>
</span> <button id="makeDefaultButton" class="btn btn-default">&nbsp;{vtranslate('LBL_SET_AS_DEFAULT', $MODULE)}</button>
<span class="btn-group"> </span>
<button id="makeDefaultButton" class="btn btn-default">&nbsp;<strong>{vtranslate('LBL_SET_AS_DEFAULT', $MODULE)}</strong></button> </span>
</span> <span class="row-fluid" id="rssFeedHeading">
</span> <h3> {vtranslate('LBL_FEEDS_LIST_FROM',$MODULE)} : {$RECORD->getName()} </h3>
<span class="row-fluid" id="rssFeedHeading"> </span>
<h3> {vtranslate('LBL_FEEDS_LIST_FROM',$MODULE)} : {$RECORD->getName()} </h3> </div>
</span> <div class="table-container feedListContainer" style="overflow: auto;">
</div> {include file='RssFeedContents.tpl'|@vtemplate_path:$MODULE}
<div class="table-container feedListContainer" style="overflow: auto;"> </div>
{include file='RssFeedContents.tpl'|@vtemplate_path:$MODULE} {else}
</div> <table class="table-container emptyRecordsDiv">
{else} <tbody>
<table class="table-container emptyRecordsDiv"> <tr>
<tbody> <td>
<tr> {assign var=SINGLE_MODULE value="SINGLE_$MODULE"}
<td> {vtranslate('LBL_NO')} {vtranslate($MODULE, $MODULE)} {vtranslate('LBL_FOUND')}. {vtranslate('LBL_CREATE')}<a class="rssAddButton" href="#" data-href="{$QUICK_LINKS['SIDEBARLINK'][0]->getUrl()}">&nbsp;{vtranslate($SINGLE_MODULE, $MODULE)}</a>
{assign var=SINGLE_MODULE value="SINGLE_$MODULE"} </td>
{vtranslate('LBL_NO')} {vtranslate($MODULE, $MODULE)} {vtranslate('LBL_FOUND')}. {vtranslate('LBL_CREATE')}<a class="rssAddButton" href="#" data-href="{$QUICK_LINKS['SIDEBARLINK'][0]->getUrl()}">&nbsp;{vtranslate($SINGLE_MODULE, $MODULE)}</a> </tr>
</td> </tbody>
</tr> </table>
</tbody> {/if}
</table> </div>
{/if} </div>
</div> <br>
</div> <div class="feedFrame">
<br> </div>
<div class="feedFrame"> </div>
</div> <div id="scroller_wrapper" class="bottom-fixed-scroll">
</div> <div id="scroller" class="scroller-div"></div>
<div id="scroller_wrapper" class="bottom-fixed-scroll"> </div>
<div id="scroller" class="scroller-div"></div> </div>
</div>
</div>
{/strip} {/strip}
...@@ -6,13 +6,8 @@ ...@@ -6,13 +6,8 @@
* Portions created by vtiger are Copyright (C) vtiger. * Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved. * All Rights Reserved.
************************************************************************************} ************************************************************************************}
{assign var="APP_IMAGE_MAP" value=[
'MARKETING' => 'fa-users', {assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
'SALES' => 'fa-dot-circle-o',
'SUPPORT' => 'fa-life-ring',
'INVENTORY' => 'vicon-inventory',
'PROJECT' => 'fa-briefcase'
]}
<div id="appnavigator" class="col-sm-12 col-xs-12 app-switcher-container app-{$SELECTED_MENU_CATEGORY}"> <div id="appnavigator" class="col-sm-12 col-xs-12 app-switcher-container app-{$SELECTED_MENU_CATEGORY}">
<a id="menu-toggle" class="menu-toggle" href="#"> <a id="menu-toggle" class="menu-toggle" href="#">
<span class="icon-bar"></span> <span class="icon-bar"></span>
......
...@@ -6,14 +6,8 @@ ...@@ -6,14 +6,8 @@
* Portions created by vtiger are Copyright (C) vtiger. * Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved. * All Rights Reserved.
************************************************************************************} ************************************************************************************}
{assign var="APP_IMAGE_MAP" value=[
'MARKETING' => 'fa-users', {assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
'SALES' => 'fa-dot-circle-o',
'SUPPORT' => 'fa-life-ring',
'INVENTORY' => 'vicon-inventory',
'PROJECT' => 'fa-briefcase'
]}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container extensionstore app-{$SELECTED_MENU_CATEGORY}"> <div class="col-sm-12 col-xs-12 app-indicator-icon-container extensionstore app-{$SELECTED_MENU_CATEGORY}">
<div class="row" title="{vtranslate('LBL_EXTENSION_STORE', 'Settings:ExtensionStore')}"> <div class="row" title="{vtranslate('LBL_EXTENSION_STORE', 'Settings:ExtensionStore')}">
<span class="app-indicator-icon cursorPointer fa fa-shopping-cart"></span> <span class="app-indicator-icon cursorPointer fa fa-shopping-cart"></span>
......