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

Merge branch '7.1.0' of http://code.vtiger.com/vtiger/vtigercrm into 7.1.0

parents f9c106bc aaea0ede
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
layouts/v7/modules/Mobile/simple/Header.tpl
+ 4
− 7
View file @ 25ae2842
...@@ -27,12 +27,11 @@ ...@@ -27,12 +27,11 @@
{* End *} {* 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-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-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/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/application.css">
<link type="text/css" rel="stylesheet" href="../../{$TEMPLATE_WEBPATH}/resources/css/style.css"> <link type="text/css" rel="stylesheet" href="../../{$TEMPLATE_WEBPATH}/resources/css/style.css">
{*Date-time-picker*} {*Date-time-picker*}
<link type="text/css" rel="stylesheet" href="../../{$TEMPLATE_WEBPATH}/resources/libs/angularjs/angular-material-datetimepicker/css/material-datetimepicker.min.css"> <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/jquery/jquery2.min.js"></script>
<script type="text/javascript" src="../../{$TEMPLATE_WEBPATH}/resources/libs/angularjs/angular.js"></script> <script type="text/javascript" src="../../{$TEMPLATE_WEBPATH}/resources/libs/angularjs/angular.js"></script>
...@@ -42,9 +41,7 @@ ...@@ -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-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/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/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/application.js"></script>
<script type="text/javascript" src="../../{$TEMPLATE_WEBPATH}/Vtiger/js/Vtiger.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> <script type="text/javascript" src="../../{$TEMPLATE_WEBPATH}/Vtiger/js/Utils.js"></script>
...@@ -67,4 +64,4 @@ ...@@ -67,4 +64,4 @@
</head> </head>
{literal} {literal}
<body ng-controller="VtigerBodyController" ng-init="init();" ng-cloak md-theme="{{dynamicTheme}}" md-theme-watch> <body ng-controller="VtigerBodyController" ng-init="init();" ng-cloak md-theme="{{dynamicTheme}}" md-theme-watch>
{/literal} {/literal}
\ No newline at end of file
layouts/v7/modules/Mobile/simple/Vtiger/js/Edit.js
+ 14
− 14
View file @ 25ae2842
...@@ -104,20 +104,20 @@ mobileapp.controller('VtigerEditController', function ($scope, $api, $mdToast, $ ...@@ -104,20 +104,20 @@ mobileapp.controller('VtigerEditController', function ($scope, $api, $mdToast, $
} }
$scope.fieldsData = processedData; $scope.fieldsData = processedData;
}; };
$api('describe', {module: $scope.module}, function (e, r) { $api('describe', {module: $scope.module}, function (e, r) {
$scope.describeObject = r.describe; $scope.describeObject = r.describe;
$scope.fields = $scope.describeObject.fields; $scope.fields = $scope.describeObject.fields;
$scope.createable = $scope.describeObject.createable; $scope.createable = $scope.describeObject.createable;
$scope.updateable = $scope.describeObject.updateable; $scope.updateable = $scope.describeObject.updateable;
$scope.deleteable = $scope.describeObject.deleteable; $scope.deleteable = $scope.describeObject.deleteable;
if($scope.record){ if($scope.record){
$scope.loadFields(); $scope.loadFields();
} }
else{ else{
prepareCreateData(true); prepareCreateData(true);
} }
}); });
$scope.gobacktoUrl = function () { $scope.gobacktoUrl = function () {
window.history.back(); window.history.back();
......
layouts/v7/modules/Mobile/simple/Vtiger/js/List.js
+ 2
− 1
View file @ 25ae2842
...@@ -24,12 +24,13 @@ mobileapp.controller('VtigerListController', function ($scope, $api, $mdDialog) ...@@ -24,12 +24,13 @@ mobileapp.controller('VtigerListController', function ($scope, $api, $mdDialog)
// To fetch Module Filters // To fetch Module Filters
$api('fetchModuleFilters', {module: $scope.module}, function (e, r) { $api('fetchModuleFilters', {module: $scope.module}, function (e, r) {
$scope.filters = r.filters; $scope.filters = r.filters;
$scope.moduleLabel = r.moduleLabel;
$scope.loadRecords(); $scope.loadRecords();
}); });
// To fetch data from service with the given params // To fetch data from service with the given params
$scope.loadRecords = function () { $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) { $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.records = r.records;
$scope.selectedFilter = r.selectedFilter; $scope.selectedFilter = r.selectedFilter;
......
layouts/v7/modules/Mobile/simple/Vtiger/js/Vtiger.js
+ 3
− 0
View file @ 25ae2842
...@@ -27,6 +27,9 @@ mobileapp.controller('VtigerBodyController', function ($scope, $api, $mdUtil, $m ...@@ -27,6 +27,9 @@ mobileapp.controller('VtigerBodyController', function ($scope, $api, $mdUtil, $m
$api('userInfo', function (e, r) { $api('userInfo', function (e, r) {
if (r) { if (r) {
var currentApp = jQuery.url().param('app'); var currentApp = jQuery.url().param('app');
if (!currentApp) {
currentApp = 'SUPPORT';
}
scopeApply(function () { scopeApply(function () {
$scope.userinfo = r.userinfo; $scope.userinfo = r.userinfo;
$scope.apps = r.apps; $scope.apps = r.apps;
......
pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/FetchModuleFilters.php
+ 1
− 1
View file @ 25ae2842
...@@ -25,7 +25,7 @@ class Mobile_WS_FetchModuleFilters extends Mobile_WS_Controller { ...@@ -25,7 +25,7 @@ class Mobile_WS_FetchModuleFilters extends Mobile_WS_Controller {
} }
} }
$response = new Mobile_API_Response(); $response = new Mobile_API_Response();
$response->setResult(array('filters'=>$result)); $response->setResult(array('filters'=>$result, 'moduleLabel' => vtranslate($module, $module)));
return $response; return $response;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright 2023 Vtiger. All rights reserved.