From a9b6a49618ac29789eec962168ce986623ad4367 Mon Sep 17 00:00:00 2001
From: satish <satish.dvnk@vtiger.com>
Date: Thu, 1 Sep 2016 15:27:06 +0530
Subject: [PATCH] #249 - Feature Request: Languages should be sorted in
alphabetical order just after installation
---
modules/Users/models/Module.php | 1 +
modules/Vtiger/models/Field.php | 3 ++-
vtlib/Vtiger/LanguageExport.php | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/modules/Users/models/Module.php b/modules/Users/models/Module.php
index a3aa0f433..dbfc99323 100644
--- a/modules/Users/models/Module.php
+++ b/modules/Users/models/Module.php
@@ -260,6 +260,7 @@ class Users_Module_Model extends Vtiger_Module_Model {
$label = decode_html($adb->query_result($result, $i, 'label'));
$languages_list[$lang_prefix] = $label;
}
+ asort($languages_list);
return $languages_list;
}
diff --git a/modules/Vtiger/models/Field.php b/modules/Vtiger/models/Field.php
index c912c6898..20aa74671 100644
--- a/modules/Vtiger/models/Field.php
+++ b/modules/Vtiger/models/Field.php
@@ -989,12 +989,13 @@ class Vtiger_Field_Model extends Vtiger_Field {
*/
public function getCurrencyList() {
$db = PearDatabase::getInstance();
- $result = $db->pquery('SELECT * FROM vtiger_currency_info WHERE currency_status = ? AND deleted=0', array('Active'));
+ $result = $db->pquery('SELECT id, currency_name FROM vtiger_currency_info WHERE currency_status = ? AND deleted=0', array('Active'));
for($i=0; $i<$db->num_rows($result); $i++) {
$currencyId = $db->query_result($result, $i, 'id');
$currencyName = $db->query_result($result, $i, 'currency_name');
$currencies[$currencyId] = $currencyName;
}
+ asort($currencies);
return $currencies;
}
diff --git a/vtlib/Vtiger/LanguageExport.php b/vtlib/Vtiger/LanguageExport.php
index 760cb96a3..83fa170a9 100644
--- a/vtlib/Vtiger/LanguageExport.php
+++ b/vtlib/Vtiger/LanguageExport.php
@@ -222,6 +222,7 @@ class Vtiger_LanguageExport extends Vtiger_Package {
$languageinfo[$prefix] = $label;
}
}
+ asort($languageinfo);
return $languageinfo;
}
}
--
GitLab