Skip to content
Snippets Groups Projects
Commit b4ae2275 authored by Sascha Schmidt's avatar Sascha Schmidt
Browse files

Merge branch 'cm_innodays_ultimateBasic' of gitlab.adito.de:xrm/basic into... 

Merge branch 'cm_innodays_ultimateBasic' of gitlab.adito.de:xrm/basic into cm_innodays_ultimateBasic
parents 1749e248 538a878b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 195 additions and 33 deletions
.aditoprj/blueprints/Blueprint_ create Open Admin View Action.xml 0 → 100644
+ 33
− 0
View file @ b4ae2275
<?xml version="1.0" encoding="UTF-8" ?>
<blueprint name="'OpenAdminView' Action">
<type>entityField</type>
<parameters>
</parameters>
<data>
<document name="entity"><![CDATA[
<entity VERSION="1.3.17">
<entityFields>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
<onActionProcess>
import("system.vars");
import("Context_lib");
AdminViewUtils.open("", []);
</onActionProcess>
<isObjectAction v="true" />
<isMenuAction v="true" />
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>
import("Context_lib");
import("system.result");
result.string(AdminViewUtils.getActionState());
</stateProcess>
</entityActionField>
</entityFields>
</entity>
]]></document>
</data>
</blueprint>
\ No newline at end of file
entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
+ 17
− 0
View file @ b4ae2275
......@@ -8,6 +8,15 @@
<titlePlural>Advertising items</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
<onActionProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<isObjectAction v="true" />
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
......@@ -227,6 +236,10 @@
<name>OnlyDigital_param</name>
<expose v="true" />
</entityParameter>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -320,6 +333,10 @@
<name>PRODUCT_ID.displayValue</name>
<expression>%aditoprj%/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/AdvertisingItem_entity/entityfields/openadminview/onActionProcess.js 0 → 100644
+ 4
− 0
View file @ b4ae2275
import("system.vars");
import("Context_lib");
AdminViewUtils.open("ADVERTISINGITEMID", []);
\ No newline at end of file
entity/AdvertisingItem_entity/entityfields/openadminview/stateProcess.js 0 → 100644
+ 4
− 0
View file @ b4ae2275
import("Context_lib");
import("system.result");
result.string(AdminViewUtils.getActionState());
\ No newline at end of file
entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js 0 → 100644
+ 9
− 0
View file @ b4ae2275
import("Product_lib");
import("system.result");
import("Sql_lib");
var sqlMask = new SqlMaskingUtils();
var sql = sqlMask.concatenate(["'TEXT:'", "(" + ProductUtils.getProductNameSubSql("ADVERTISINGITEM.PRODUCT_ID") + ")"]);
result.string(sql.toString());
entity/CampaignStep_entity/CampaignStep_entity.aod
+ 42
− 33
View file @ b4ae2275
......@@ -272,20 +272,6 @@
</entityParameter>
</children>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
<title>New activity</title>
<onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>VAADIN:HOURGLASS</iconId>
<tooltip>New activity</tooltip>
<tooltipProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>newTask</name>
<title>New task</title>
<onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
<iconId>VAADIN:TASKS</iconId>
</entityActionField>
<entityField>
<name>PREDECESSORSTEP_ID</name>
<title>Predecessor</title>
......@@ -340,12 +326,6 @@
<name>maxSort_param</name>
<expose v="true" />
</entityParameter>
<entityActionField>
<name>newCampaignStep</name>
<title>New step</title>
<onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newcampaignstep/onActionProcess.js</onActionProcess>
<iconId>NEON:GROUP_APPOINTMENT</iconId>
</entityActionField>
<entityParameter>
<name>predecessorstepId_param</name>
<expose v="true" />
......@@ -372,6 +352,39 @@
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>WORKFLOWDEFINITION_KEY</name>
<title>Workflow</title>
<consumer>Workflows</consumer>
</entityField>
<entityConsumer>
<name>Workflows</name>
<dependency>
<name>dependency</name>
<entityName>WorkflowDefinition_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
<title>New activity</title>
<onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>VAADIN:HOURGLASS</iconId>
<tooltip>New activity</tooltip>
<tooltipProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>newTask</name>
<title>New task</title>
<onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
<iconId>VAADIN:TASKS</iconId>
</entityActionField>
<entityActionField>
<name>newCampaignStep</name>
<title>New step</title>
<onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newcampaignstep/onActionProcess.js</onActionProcess>
<iconId>NEON:GROUP_APPOINTMENT</iconId>
</entityActionField>
<entityActionGroup>
<name>group</name>
<children>
......@@ -413,19 +426,15 @@
</entityActionField>
</children>
</entityActionGroup>
<entityField>
<name>WORKFLOWDEFINITION_KEY</name>
<title>Workflow</title>
<consumer>Workflows</consumer>
</entityField>
<entityConsumer>
<name>Workflows</name>
<dependency>
<name>dependency</name>
<entityName>WorkflowDefinition_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
<onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<isObjectAction v="true" />
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/CampaignStep_entity/entityfields/openadminview/onActionProcess.js 0 → 100644
+ 9
− 0
View file @ b4ae2275
import("system.vars");
import("Context_lib");
AdminViewUtils.open("CAMPAIGNSTEPID", [
["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
["USER_NEW", vars.get("$field.USER_NEW")],
["USER_EDIT", vars.get("$field.USER_EDIT")]
]);
\ No newline at end of file
entity/CampaignStep_entity/entityfields/openadminview/stateProcess.js 0 → 100644
+ 4
− 0
View file @ b4ae2275
import("Context_lib");
import("system.result");
result.string(AdminViewUtils.getActionState());
\ No newline at end of file
entity/CommunicationSettings_entity/CommunicationSettings_entity.aod
+ 9
− 0
View file @ b4ae2275
......@@ -10,6 +10,15 @@
<titlePlural>Communication Settings</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
<onActionProcess>%aditoprj%/entity/CommunicationSettings_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<isObjectAction v="true" />
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/CommunicationSettings_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
......
entity/CommunicationSettings_entity/entityfields/openadminview/onActionProcess.js 0 → 100644
+ 9
− 0
View file @ b4ae2275
import("system.vars");
import("Context_lib");
AdminViewUtils.open("COMMUNICATIONSETTINGSID", [
["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
["USER_NEW", vars.get("$field.USER_NEW")],
["USER_EDIT", vars.get("$field.USER_EDIT")]
]);
\ No newline at end of file
entity/CommunicationSettings_entity/entityfields/openadminview/stateProcess.js 0 → 100644
+ 4
− 0
View file @ b4ae2275
import("Context_lib");
import("system.result");
result.string(AdminViewUtils.getActionState());
\ No newline at end of file
entity/Competition_entity/Competition_entity.aod
+ 9
− 0
View file @ b4ae2275
......@@ -7,6 +7,15 @@
<titlePlural>Competition</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
<onActionProcess>%aditoprj%/entity/Competition_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<isObjectAction v="true" />
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Competition_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
......
entity/Competition_entity/entityfields/openadminview/onActionProcess.js 0 → 100644
+ 4
− 0
View file @ b4ae2275
import("system.vars");
import("Context_lib");
AdminViewUtils.open("COMPETITIONID", []);
\ No newline at end of file
entity/Competition_entity/entityfields/openadminview/stateProcess.js 0 → 100644
+ 4
− 0
View file @ b4ae2275
import("Context_lib");
import("system.result");
result.string(AdminViewUtils.getActionState());
\ No newline at end of file
entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
+ 9
− 0
View file @ b4ae2275
......@@ -7,6 +7,15 @@
<titlePlural>Descriptions</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
<onActionProcess>%aditoprj%/entity/DescriptionTranslation_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<isObjectAction v="true" />
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/DescriptionTranslation_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
......
entity/DescriptionTranslation_entity/entityfields/openadminview/onActionProcess.js 0 → 100644
+ 4
− 0
View file @ b4ae2275
import("system.vars");
import("Context_lib");
AdminViewUtils.open("KNOWLEDGEMANAGEMENTID", []);
\ No newline at end of file
entity/DescriptionTranslation_entity/entityfields/openadminview/stateProcess.js 0 → 100644
+ 4
− 0
View file @ b4ae2275
import("Context_lib");
import("system.result");
result.string(AdminViewUtils.getActionState());
\ No newline at end of file
entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod
+ 9
− 0
View file @ b4ae2275
......@@ -9,6 +9,15 @@
<titlePlural>Employee group rule groups</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
<onActionProcess>%aditoprj%/entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<isObjectAction v="true" />
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
......
entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/onActionProcess.js 0 → 100644
+ 4
− 0
View file @ b4ae2275
import("system.vars");
import("Context_lib");
AdminViewUtils.open("EMPLOYEEGROUP_RULEGROUPID", []);
\ No newline at end of file
entity/EmployeeGroupRuleGroup_entity/entityfields/openadminview/stateProcess.js 0 → 100644
+ 4
− 0
View file @ b4ae2275
import("Context_lib");
import("system.result");
result.string(AdminViewUtils.getActionState());
\ No newline at end of file
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