Skip to content
Snippets Groups Projects
Commit 61fb34dc authored by Andre Loreth's avatar Andre Loreth
Browse files

Merge remote-tracking branch 'origin/master'

parents d3ff2a2b 1ca0b1a4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 68 additions and 25 deletions
entity/Contact_entity/Contact_entity.aod
+ 8
− 1
View file @ 61fb34dc
......@@ -58,7 +58,6 @@
<children>
<entityParameter>
<name>WithPrivate_param</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/withprivate_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
......@@ -128,6 +127,8 @@
<title>Language</title>
<consumer>Languages</consumer>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/language/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>Languages</name>
......@@ -190,6 +191,12 @@
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
<name>LanguageKey_param</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/languagekey_param/valueProcess.js</valueProcess>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Contact_entity/entityfields/language/displayValueProcess.js 0 → 100644
+ 10
− 0
View file @ 61fb34dc
import("system.result");
import("system.vars");
import("Keyword_lib");
var key = vars.get("$field.LANGUAGE");
if (key)
{
var res = LanguageKeywordUtils.getViewValue(key);
result.string(res);
}
entity/Contact_entity/entityfields/language/valueProcess.js 0 → 100644
+ 5
− 0
View file @ 61fb34dc
import("system.vars");
import("system.result");
var key = vars.get("$param.LanguageKey_param");
result.string(key);
\ No newline at end of file
entity/Contact_entity/entityfields/organisations/children/withprivate_param/valueProcess.js → entity/Contact_entity/entityfields/languagekey_param/valueProcess.js
+ 1
− 2
View file @ 61fb34dc
import("system.result");
result.string(true);
\ No newline at end of file
result.string("deu");
\ No newline at end of file
entity/Person_entity/Person_entity.aod
+ 5
− 2
View file @ 61fb34dc
......@@ -208,7 +208,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<children>
<entityParameter>
<name>WithPrivate_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisations/children/withprivate_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
......@@ -296,6 +295,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<consumer>Languages</consumer>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/language/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/language/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
......@@ -479,7 +479,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<title>standard address</title>
<consumer>ContactAndOrganisationAddresses</consumer>
<searchable v="false" />
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityActionField>
......@@ -726,6 +725,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>OwnContactId_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/othercontacts/children/owncontactid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>LanguageKey_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/othercontacts/children/languagekey_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityField>
......
entity/Person_entity/entityfields/language/displayValueProcess.js 0 → 100644
+ 10
− 0
View file @ 61fb34dc
import("system.result");
import("system.vars");
import("Keyword_lib");
var key = vars.get("$field.LANGUAGE");
if (key)
{
var res = LanguageKeywordUtils.getViewValue(key);
result.string(res);
}
entity/Person_entity/entityfields/language/valueProcess.js
+ 1
− 1
View file @ 61fb34dc
......@@ -3,5 +3,5 @@ import("system.vars");
import("system.db");
import("system.result");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.LANGUAGE") == "")
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.getString("$field.LANGUAGE") == "")
result.string("deu");
\ No newline at end of file
entity/Person_entity/entityfields/organisations/children/withprivate_param/valueProcess.js deleted 100644 → 0
+ 0
− 3
View file @ d3ff2a2b
import("system.result");
result.string(true);
\ No newline at end of file
entity/Person_entity/entityfields/othercontacts/children/languagekey_param/valueProcess.js 0 → 100644
+ 5
− 0
View file @ 61fb34dc
import("system.result");
import("system.vars");
var res = vars.get("$field.LANGUAGE");
result.string(res);
\ No newline at end of file
neonView/AddressEdit_view/AddressEdit_view.aod
+ 0
− 4
View file @ 61fb34dc
......@@ -37,10 +37,6 @@
<name>fafca9d6-c6dd-4b66-b1ff-1d6ba451827b</name>
<entityField>CITY</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e7804363-405d-429d-91c9-23de9685cc9a</name>
<entityField>STATE</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
......
neonView/AddressFilter_view/AddressFilter_view.aod
+ 0
− 4
View file @ 61fb34dc
......@@ -37,10 +37,6 @@
<name>57247c5c-6498-420b-b288-68ca316cf7f2</name>
<entityField>CITY</entityField>
</neonTableColumn>
<neonTableColumn>
<name>9a965a25-a8aa-4777-865e-138624f2d848</name>
<entityField>STATE</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
</children>
......
neonView/AddressList_view/AddressList_view.aod
+ 0
− 4
View file @ 61fb34dc
......@@ -38,10 +38,6 @@
<name>12727b21-0359-4430-a9c2-54eb48e2e864</name>
<entityField>CITY</entityField>
</neonTableColumn>
<neonTableColumn>
<name>17039f2e-4253-4242-bcc4-b75483adfbd0</name>
<entityField>STATE</entityField>
</neonTableColumn>
</columns>
</titledListViewTemplate>
</children>
......
neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
+ 0
− 4
View file @ 61fb34dc
......@@ -36,10 +36,6 @@
<name>fafca2d6-c2dd-4b66-b1ff-1d6ba451827b</name>
<entityField>CITY</entityField>
</neonTableColumn>
<neonTableColumn>
<name>945bd8e7-9d0d-4e32-8908-24d8dfb74463</name>
<entityField>STATE</entityField>
</neonTableColumn>
</columns>
</genericMultipleViewTemplate>
</children>
......
process/Keyword_lib/process.js
+ 23
− 0
View file @ 61fb34dc
......@@ -217,6 +217,29 @@ LanguageKeywordUtils.getResolvedTitleSqlPart = function(pDbFieldName, pLocale)
return db.translateStatement(resSql);
};
/**
* returns a specific name (translated) - this is normally the view-value of a language
*
* @param {String} key id value of the language where the view-value shall be searched
*
* @return {String} representation of the translated name
*
*/
LanguageKeywordUtils.getViewValue = function(key)
{
if (!key)
return "";
var sql = SqlCondition.begin()
.andPrepare("AB_LANGUAGE.ISO3", key)
.buildSql("select AB_LANGUAGE.NAME_LATIN from AB_LANGUAGE");
var originalTitle = db.cell(sql);
if (originalTitle == "")
return "";
var translatedTitle = translate.text(originalTitle);
return translatedTitle;
};
/**
* provides methods for interactions with legcy keywords
......
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