Skip to content
Snippets Groups Projects
Commit ce5d00c1 authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

Merge branch '#1070638-ContentTypeAdminView' into '2021.0.0'

#1070638-ContentTypeAdminView Add DisplayValue and Add Contetentypes Date

See merge request xrm/basic!583
parents e6e6f86a 88c8a120
No related branches found
No related tags found
No related merge requests found
Showing with 29 additions and 17 deletions
...@@ -4,8 +4,8 @@ import("Context_lib"); ...@@ -4,8 +4,8 @@ import("Context_lib");
AdminViewUtils.open("ACTIVITYID", [ AdminViewUtils.open("ACTIVITYID", [
["PARENT_ID", vars.get("$field.PARENT_ID")], ["PARENT_ID", vars.get("$field.PARENT_ID")],
["PARENT_CONTEXT", vars.get("$field.PARENT_CONTEXT")], ["PARENT_CONTEXT", vars.get("$field.PARENT_CONTEXT")],
["DATE_NEW", vars.get("$field.DATE_NEW")], ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
["DATE_EDIT", vars.get("$field.DATE_EDIT")], ["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
["USER_NEW", vars.get("$field.USER_NEW")], ["USER_NEW", vars.get("$field.USER_NEW")],
["USER_EDIT", vars.get("$field.USER_EDIT")] ["USER_EDIT", vars.get("$field.USER_EDIT")]
]); ]);
\ No newline at end of file
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<entityField> <entityField>
<name>VALUE</name> <name>VALUE</name>
<contentTypeProcess>%aditoprj%/entity/AdminViewRow_entity/entityfields/value/contentTypeProcess.js</contentTypeProcess> <contentTypeProcess>%aditoprj%/entity/AdminViewRow_entity/entityfields/value/contentTypeProcess.js</contentTypeProcess>
<displayValueProcess>%aditoprj%/entity/AdminViewRow_entity/entityfields/value/displayValueProcess.js</displayValueProcess>
</entityField> </entityField>
<entityParameter> <entityParameter>
<name>Rows_param</name> <name>Rows_param</name>
......
import("system.vars");
import("Attribute_lib");
import("system.result");
result.string(AttributeTypeUtil.getAttributeViewValue(vars.get("$field.CONTENTTYPE"), vars.get("$field.VALUE"), null));
\ No newline at end of file
...@@ -3,8 +3,8 @@ import("Context_lib"); ...@@ -3,8 +3,8 @@ import("Context_lib");
AdminViewUtils.open("CAMPAIGNID", [ AdminViewUtils.open("CAMPAIGNID", [
["EMPLOYEE_CONTACT_ID", vars.get("$field.EMPLOYEE_CONTACT_ID")], ["EMPLOYEE_CONTACT_ID", vars.get("$field.EMPLOYEE_CONTACT_ID")],
["DATE_NEW", vars.get("$field.DATE_NEW")], ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
["DATE_EDIT", vars.get("$field.DATE_EDIT")], ["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
["USER_NEW", vars.get("$field.USER_NEW")], ["USER_NEW", vars.get("$field.USER_NEW")],
["USER_EDIT", vars.get("$field.USER_EDIT")] ["USER_EDIT", vars.get("$field.USER_EDIT")]
]); ]);
\ No newline at end of file
import("system.vars"); import("system.vars");
import("Context_lib"); import("Context_lib");
AdminViewUtils.open("EXPORTTEMPLATEID", ["DATE_NEW", "DATE_EDIT", "USER_NEW", "USER_EDIT"]); AdminViewUtils.open("EXPORTTEMPLATEID", [
\ No newline at end of file ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
["USER_NEW", vars.get("$field.USER_NEW"), "DATE"],
["USER_EDIT", vars.get("$field.USER_EDIT"), "DATE"]
]);
\ No newline at end of file
...@@ -6,8 +6,8 @@ result.string(AdminViewUtils.open("OFFERID", [ ...@@ -6,8 +6,8 @@ result.string(AdminViewUtils.open("OFFERID", [
["CONTACT_ID", vars.get("$field.CONTACT_ID")], ["CONTACT_ID", vars.get("$field.CONTACT_ID")],
["CONTACT_ORG_ID", vars.get("$field.CONTACT_ORG_ID")], ["CONTACT_ORG_ID", vars.get("$field.CONTACT_ORG_ID")],
["CONTACT_PERSON_ID", vars.get("$field.CONTACT_PERSON_ID")], ["CONTACT_PERSON_ID", vars.get("$field.CONTACT_PERSON_ID")],
["DATE_NEW", vars.get("$field.DATE_NEW")], ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
["DATE_EDIT", vars.get("$field.DATE_EDIT")], ["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
["USER_NEW", vars.get("$field.USER_NEW")], ["USER_NEW", vars.get("$field.USER_NEW")],
["USER_EDIT", vars.get("$field.USER_EDIT")] ["USER_EDIT", vars.get("$field.USER_EDIT")]
])); ]));
\ No newline at end of file
...@@ -4,9 +4,9 @@ import("Context_lib"); ...@@ -4,9 +4,9 @@ import("Context_lib");
AdminViewUtils.open("CONTACTID", [ AdminViewUtils.open("CONTACTID", [
["ORGANISATION_ID", vars.get("$field.ORGANISATION_ID")], ["ORGANISATION_ID", vars.get("$field.ORGANISATION_ID")],
["ADDRESS_ID", vars.get("$field.ADDRESS_ID")], ["ADDRESS_ID", vars.get("$field.ADDRESS_ID")],
["DATE_NEW", vars.get("$field.DATE_NEW")], ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
["DATE_EDIT", vars.get("$field.DATE_EDIT")], ["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
["DATE_NEW_CONTACT", vars.get("$field.DATE_NEW_CONTACT")], ["DATE_NEW_CONTACT", vars.get("$field.DATE_NEW_CONTACT"), "DATE"],
["USER_NEW", vars.get("$field.USER_NEW")], ["USER_NEW", vars.get("$field.USER_NEW")],
["USER_EDIT", vars.get("$field.USER_EDIT")], ["USER_EDIT", vars.get("$field.USER_EDIT")],
["USER_NEW_CONTACT", vars.get("$field.USER_NEW_CONTACT")], ["USER_NEW_CONTACT", vars.get("$field.USER_NEW_CONTACT")],
......
...@@ -5,9 +5,9 @@ AdminViewUtils.open("CONTACTID", [ ...@@ -5,9 +5,9 @@ AdminViewUtils.open("CONTACTID", [
["PERSON_ID", vars.get("$field.PERSON_ID")], ["PERSON_ID", vars.get("$field.PERSON_ID")],
["ORGANISATION_ID", vars.get("$field.ORGANISATION_ID")], ["ORGANISATION_ID", vars.get("$field.ORGANISATION_ID")],
["ADDRESS_ID", vars.get("$field.ADDRESS_ID")], ["ADDRESS_ID", vars.get("$field.ADDRESS_ID")],
["DATE_NEW", vars.get("$field.DATE_NEW")], ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
["DATE_EDIT", vars.get("$field.DATE_EDIT")], ["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
["DATE_NEW_CONTACT", vars.get("$field.DATE_NEW_CONTACT")], ["DATE_NEW_CONTACT", vars.get("$field.DATE_NEW_CONTACT"), "DATE"],
["USER_NEW", vars.get("$field.USER_NEW")], ["USER_NEW", vars.get("$field.USER_NEW")],
["USER_EDIT", vars.get("$field.USER_EDIT")], ["USER_EDIT", vars.get("$field.USER_EDIT")],
["USER_NEW_CONTACT", vars.get("$field.USER_NEW_CONTACT")], ["USER_NEW_CONTACT", vars.get("$field.USER_NEW_CONTACT")],
......
...@@ -3,8 +3,8 @@ import("Context_lib"); ...@@ -3,8 +3,8 @@ import("Context_lib");
AdminViewUtils.open("PRODUCTID", [ AdminViewUtils.open("PRODUCTID", [
["CONTACT_ID", vars.get("$field.CONTACT_ID")], ["CONTACT_ID", vars.get("$field.CONTACT_ID")],
["DATE_NEW", vars.get("$field.DATE_NEW")], ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
["DATE_EDIT", vars.get("$field.DATE_EDIT")], ["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
["USER_NEW", vars.get("$field.USER_NEW")], ["USER_NEW", vars.get("$field.USER_NEW"), "DATE"],
["USER_EDIT", vars.get("$field.USER_EDIT")] ["USER_EDIT", vars.get("$field.USER_EDIT"), "DATE"]
]); ]);
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment