Skip to content

Commit 78c8e0b

Browse files
piszostapiszosta
authored
Merge branch 'main' into relatedListRows
2 parents 99926f6 + e61aa48 commit 78c8e0b

File tree

5 files changed

+91
-2
lines changed

5 files changed

+91
-2
lines changed

‎force-app/functionality/activities/classes/Activity_AddAccountHelperTest.cls

+5
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ private without sharing class Activity_AddAccountHelperTest {
6565
.getRecordTypeId();
6666
Event e = new Event(
6767
TAG_ActivityType__c = 'Rekruttere og inkludere',
68+
TAG_service__c = 'Jobbmesser og møteplass',
6869
TAG_NoPersonInformation__c = true,
6970
RecordTypeId = agRecordType,
7071
ActivityDate = Date.today(),
@@ -101,6 +102,7 @@ private without sharing class Activity_AddAccountHelperTest {
101102
IsAllDayEvent = true,
102103
ActivityDate = Date.today(),
103104
TAG_ActivityType__c = 'Rekruttere og inkludere',
105+
TAG_service__c = 'Jobbmesser og møteplass',
104106
Subject = 'Hele dagen'
105107
);
106108
Event e_old = new Event(
@@ -110,6 +112,7 @@ private without sharing class Activity_AddAccountHelperTest {
110112
IsAllDayEvent = true,
111113
ActivityDate = Date.today(),
112114
TAG_ActivityType__c = 'Rekruttere og inkludere',
115+
TAG_service__c = 'Jobbmesser og møteplass',
113116
Subject = 'Hele dagen'
114117
);
115118
insert e_new;
@@ -142,6 +145,7 @@ private without sharing class Activity_AddAccountHelperTest {
142145
IsAllDayEvent = true,
143146
ActivityDate = Date.today(),
144147
TAG_ActivityType__c = 'Rekruttere og inkludere',
148+
TAG_service__c = 'Jobbmesser og møteplass',
145149
Subject = 'Hele dagen',
146150
RecordTypeId = agRecordType
147151
);
@@ -152,6 +156,7 @@ private without sharing class Activity_AddAccountHelperTest {
152156
IsAllDayEvent = true,
153157
ActivityDate = Date.today(),
154158
TAG_ActivityType__c = 'Rekruttere og inkludere',
159+
TAG_service__c = 'Jobbmesser og møteplass',
155160
Subject = 'Hele dagen',
156161
RecordTypeId = agRecordType
157162
);

‎force-app/functionality/activities/classes/Activity_AddAccountTest.cls

+1
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ private without sharing class Activity_AddAccountTest {
215215
IsAllDayEvent = true,
216216
ActivityDate = Date.today(),
217217
TAG_ActivityType__c = 'Rekruttere og inkludere',
218+
TAG_service__c = 'Jobbmesser og møteplass',
218219
Subject = 'Hele dagen',
219220
RecordTypeId = agRecordType
220221
);

‎force-app/main/default/flexipages/Task_Record_Page.flexipage-meta.xml

+22
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,32 @@
33
<flexiPageRegions>
44
<itemInstances>
55
<componentInstance>
6+
<componentInstanceProperties>
7+
<name>actionNames</name>
8+
<valueList>
9+
<valueListItems>
10+
<value>Edit</value>
11+
</valueListItems>
12+
<valueListItems>
13+
<value>Delete</value>
14+
</valueListItems>
15+
<valueListItems>
16+
<value>Task.Change_owner</value>
17+
</valueListItems>
18+
</valueList>
19+
</componentInstanceProperties>
620
<componentInstanceProperties>
721
<name>collapsed</name>
822
<value>false</value>
923
</componentInstanceProperties>
24+
<componentInstanceProperties>
25+
<name>enableActionsConfiguration</name>
26+
<value>true</value>
27+
</componentInstanceProperties>
28+
<componentInstanceProperties>
29+
<name>enableActionsInNative</name>
30+
<value>true</value>
31+
</componentInstanceProperties>
1032
<componentInstanceProperties>
1133
<name>hideChatterActions</name>
1234
<value>false</value>

‎force-app/main/default/objects/Event/validationRules/Related_To_is_required.validationRule-meta.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
33
<fullName>Related_To_is_required</fullName>
44
<active>true</active>
5-
<errorConditionFormula>IF( RecordType.Name = &apos;AG Møte&apos; &amp;&amp; ISBLANK( WhatId ) , true, false)</errorConditionFormula>
6-
<errorMessage>Feltet &quot;Relatert til&quot; må være fylt ut</errorMessage>
5+
<errorConditionFormula>IF( OR(RecordType.Name = &apos;AG Møte&apos;,RecordType.Name = &apos;IA event&apos;) &amp;&amp; OR(ISBLANK( WhatId ),ISBLANK( TEXT(TAG_ActivityType__c) ),ISBLANK( TEXT(TAG_service__c) )), true, false)</errorConditionFormula>
6+
<errorMessage>Feltene &quot;Relatert til&quot;, &quot;Tema&quot; og &quot;Tjeneste&quot; må være fylt ut</errorMessage>
77
</ValidationRule>

‎force-app/unpackagable/flexipages/TAG_EmployerDefaultRecordPage.flexipage-meta.xml

+61
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,67 @@
477477
<identifier>accountTeamMember</identifier>
478478
</componentInstance>
479479
</itemInstances>
480+
<itemInstances>
481+
<componentInstance>
482+
<componentInstanceProperties>
483+
<name>actionNames</name>
484+
</componentInstanceProperties>
485+
<componentInstanceProperties>
486+
<name>adminFilters</name>
487+
</componentInstanceProperties>
488+
<componentInstanceProperties>
489+
<name>maxRecordsToDisplay</name>
490+
<value>3</value>
491+
</componentInstanceProperties>
492+
<componentInstanceProperties>
493+
<name>parentFieldApiName</name>
494+
<value>Account.Id</value>
495+
</componentInstanceProperties>
496+
<componentInstanceProperties>
497+
<name>relatedListApiName</name>
498+
<value>Dialogue_Meetings__r</value>
499+
</componentInstanceProperties>
500+
<componentInstanceProperties>
501+
<name>relatedListDisplayType</name>
502+
<value>ADVGRID</value>
503+
</componentInstanceProperties>
504+
<componentInstanceProperties>
505+
<name>relatedListFieldAliases</name>
506+
<valueList>
507+
<valueListItems>
508+
<value>Link__c</value>
509+
</valueListItems>
510+
<valueListItems>
511+
<value>NAME</value>
512+
</valueListItems>
513+
<valueListItems>
514+
<value>Status__c</value>
515+
</valueListItems>
516+
<valueListItems>
517+
<value>MeetingTime__c</value>
518+
</valueListItems>
519+
</valueList>
520+
</componentInstanceProperties>
521+
<componentInstanceProperties>
522+
<name>relatedListLabel</name>
523+
<value>Dialogmøter</value>
524+
</componentInstanceProperties>
525+
<componentInstanceProperties>
526+
<name>showActionBar</name>
527+
<value>true</value>
528+
</componentInstanceProperties>
529+
<componentInstanceProperties>
530+
<name>sortFieldAlias</name>
531+
<value>__DEFAULT__</value>
532+
</componentInstanceProperties>
533+
<componentInstanceProperties>
534+
<name>sortFieldOrder</name>
535+
<value>Default</value>
536+
</componentInstanceProperties>
537+
<componentName>lst:dynamicRelatedList</componentName>
538+
<identifier>lst_dynamicRelatedList16</identifier>
539+
</componentInstance>
540+
</itemInstances>
480541
<name>Facet-8a12c5ef-b1b3-4d1c-a97b-a71ab4438a53</name>
481542
<type>Facet</type>
482543
</flexiPageRegions>

0 commit comments

Comments
 (0)