diff --git a/layouts/v7/modules/Mobile/simple/Header.tpl b/layouts/v7/modules/Mobile/simple/Header.tpl
index e9d9d17017e558fd6712786dfff5040b0423fa69..79490ef0b549e36932cbef78a2a33cd5ba5a39a3 100644
--- a/layouts/v7/modules/Mobile/simple/Header.tpl
+++ b/layouts/v7/modules/Mobile/simple/Header.tpl
@@ -27,12 +27,11 @@
{* End *}
<link type="text/css" rel="stylesheet" href="../../{$TEMPLATE_WEBPATH}/resources/libs/md-icons/css/materialdesignicons.min.css">
<link type="text/css" rel="stylesheet" href="../../{$TEMPLATE_WEBPATH}/resources/libs/md-datepicker/angular-datepicker.min.css">
- <link type="text/css" rel="stylesheet" href="../../{$TEMPLATE_WEBPATH}/resources/libs/md-datepicker/angular-clockpicker.css">
<link type="text/css" rel="stylesheet" href="../../{$TEMPLATE_WEBPATH}/resources/libs/Vtiger-icons/style.css">
<link type="text/css" rel="stylesheet" href="../../{$TEMPLATE_WEBPATH}/resources/css/application.css">
<link type="text/css" rel="stylesheet" href="../../{$TEMPLATE_WEBPATH}/resources/css/style.css">
- {*Date-time-picker*}
- <link type="text/css" rel="stylesheet" href="../../{$TEMPLATE_WEBPATH}/resources/libs/angularjs/angular-material-datetimepicker/css/material-datetimepicker.min.css">
+ {*Date-time-picker*}
+ <link type="text/css" rel="stylesheet" href="../../{$TEMPLATE_WEBPATH}/resources/libs/angularjs/angular-material-datetimepicker/css/material-datetimepicker.min.css">
<script type="text/javascript" src="../../{$TEMPLATE_WEBPATH}/resources/libs/jquery/jquery2.min.js"></script>
<script type="text/javascript" src="../../{$TEMPLATE_WEBPATH}/resources/libs/angularjs/angular.js"></script>
@@ -42,9 +41,7 @@
<script type="text/javascript" src="../../{$TEMPLATE_WEBPATH}/resources/libs/angularjs/angular-material.min.js"></script>
<script type="text/javascript" src="../../{$TEMPLATE_WEBPATH}/resources/libs/angularjs/angular-touch.min.js"></script>
<script type="text/javascript" src="../../{$TEMPLATE_WEBPATH}/resources/libs/jquery/purl.js"></script>
- <script type="text/javascript" src="../../{$TEMPLATE_WEBPATH}/resources/libs/jquery/date.js"></script>
- <script type="text/javascript" src="../../{$TEMPLATE_WEBPATH}/resources/libs/md-datepicker/angular-datepicker.min.js"></script>
- <script type="text/javascript" src="../../{$TEMPLATE_WEBPATH}/resources/libs/md-datepicker/angular-clockpicker.js"></script>
+
<script type="text/javascript" src="../../{$TEMPLATE_WEBPATH}/Vtiger/js/application.js"></script>
<script type="text/javascript" src="../../{$TEMPLATE_WEBPATH}/Vtiger/js/Vtiger.js"></script>
<script type="text/javascript" src="../../{$TEMPLATE_WEBPATH}/Vtiger/js/Utils.js"></script>
@@ -67,4 +64,4 @@
</head>
{literal}
<body ng-controller="VtigerBodyController" ng-init="init();" ng-cloak md-theme="{{dynamicTheme}}" md-theme-watch>
- {/literal}
+ {/literal}
\ No newline at end of file
diff --git a/layouts/v7/modules/Mobile/simple/Vtiger/js/Edit.js b/layouts/v7/modules/Mobile/simple/Vtiger/js/Edit.js
index 63363f92dca331b3c4626b0786a664f357c3c678..6c52a3180f230a56a737163a2d9f5b9578b1a0a5 100644
--- a/layouts/v7/modules/Mobile/simple/Vtiger/js/Edit.js
+++ b/layouts/v7/modules/Mobile/simple/Vtiger/js/Edit.js
@@ -104,20 +104,20 @@ mobileapp.controller('VtigerEditController', function ($scope, $api, $mdToast, $
}
$scope.fieldsData = processedData;
};
-
- $api('describe', {module: $scope.module}, function (e, r) {
- $scope.describeObject = r.describe;
- $scope.fields = $scope.describeObject.fields;
- $scope.createable = $scope.describeObject.createable;
- $scope.updateable = $scope.describeObject.updateable;
- $scope.deleteable = $scope.describeObject.deleteable;
- if($scope.record){
- $scope.loadFields();
- }
- else{
- prepareCreateData(true);
- }
- });
+
+ $api('describe', {module: $scope.module}, function (e, r) {
+ $scope.describeObject = r.describe;
+ $scope.fields = $scope.describeObject.fields;
+ $scope.createable = $scope.describeObject.createable;
+ $scope.updateable = $scope.describeObject.updateable;
+ $scope.deleteable = $scope.describeObject.deleteable;
+ if($scope.record){
+ $scope.loadFields();
+ }
+ else{
+ prepareCreateData(true);
+ }
+ });
$scope.gobacktoUrl = function () {
window.history.back();
diff --git a/layouts/v7/modules/Mobile/simple/Vtiger/js/List.js b/layouts/v7/modules/Mobile/simple/Vtiger/js/List.js
index ebc2a504c5f71c7907d55e4243882c2d45413e71..b94fc382ef13cdfbde78ce422721160ffed0f02f 100644
--- a/layouts/v7/modules/Mobile/simple/Vtiger/js/List.js
+++ b/layouts/v7/modules/Mobile/simple/Vtiger/js/List.js
@@ -24,12 +24,13 @@ mobileapp.controller('VtigerListController', function ($scope, $api, $mdDialog)
// To fetch Module Filters
$api('fetchModuleFilters', {module: $scope.module}, function (e, r) {
$scope.filters = r.filters;
+ $scope.moduleLabel = r.moduleLabel;
$scope.loadRecords();
});
// To fetch data from service with the given params
$scope.loadRecords = function () {
- $scope.pageTitle = $scope.module;
+ $scope.pageTitle = $scope.moduleLabel;
$api('listModuleRecords', {module: $scope.module, filterid: $scope.selectedFilter, page: $scope.page, orderBy: $scope.orderBy, sortOrder: $scope.sortOrder}, function (e, r) {
$scope.records = r.records;
$scope.selectedFilter = r.selectedFilter;
diff --git a/layouts/v7/modules/Mobile/simple/Vtiger/js/Vtiger.js b/layouts/v7/modules/Mobile/simple/Vtiger/js/Vtiger.js
index 4506734f4bc2532a4d17bec624921093ed55a7aa..5aef10fb86a917a89a341916a67c51c2d9783c3e 100644
--- a/layouts/v7/modules/Mobile/simple/Vtiger/js/Vtiger.js
+++ b/layouts/v7/modules/Mobile/simple/Vtiger/js/Vtiger.js
@@ -27,6 +27,9 @@ mobileapp.controller('VtigerBodyController', function ($scope, $api, $mdUtil, $m
$api('userInfo', function (e, r) {
if (r) {
var currentApp = jQuery.url().param('app');
+ if (!currentApp) {
+ currentApp = 'SUPPORT';
+ }
scopeApply(function () {
$scope.userinfo = r.userinfo;
$scope.apps = r.apps;
diff --git a/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/FetchModuleFilters.php b/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/FetchModuleFilters.php
index c064c180916e5e94114beccd334a9c3afb3a6b40..89990180548b8a6cadc264ed2df8b364aa34d9d4 100644
--- a/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/FetchModuleFilters.php
+++ b/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/FetchModuleFilters.php
@@ -25,7 +25,7 @@ class Mobile_WS_FetchModuleFilters extends Mobile_WS_Controller {
}
}
$response = new Mobile_API_Response();
- $response->setResult(array('filters'=>$result));
+ $response->setResult(array('filters'=>$result, 'moduleLabel' => vtranslate($module, $module)));
return $response;
}