Skip to content

Commit 6f5c9c0

Browse files
lukaszgryglickilukaszgryglicki
authored
Merge pull request #4658 from communitybridge/unicron-4638-remove-mailing-address-fields-from-templates-and-code
Remove mailing address 1,2,3 everywhere
2 parents 1a25a82 + 5bdb8d0 commit 6f5c9c0

File tree

8 files changed

+1
-267
lines changed

8 files changed

+1
-267
lines changed

‎cla-backend-go/template/repository.go‎

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -496,42 +496,6 @@ var templateMap = map[string]models.Template{
496496
OffsetX: 65, // 55 need to move over
497497
OffsetY: -8,
498498
},
499-
{
500-
ID: "mailing_address1",
501-
Name: "Mailing Address",
502-
AnchorString: "Mailing Address:",
503-
FieldType: "text_unlocked",
504-
IsOptional: false,
505-
IsEditable: false,
506-
Width: 300,
507-
Height: 20,
508-
OffsetX: 105,
509-
OffsetY: -7,
510-
},
511-
{
512-
ID: "mailing_address2",
513-
Name: "Mailing Address",
514-
AnchorString: "Mailing Address:",
515-
FieldType: "text_unlocked",
516-
IsOptional: false,
517-
IsEditable: false,
518-
Width: 340,
519-
Height: 20,
520-
OffsetX: 0,
521-
OffsetY: 20,
522-
},
523-
{
524-
ID: "mailing_address3",
525-
Name: "Mailing Address",
526-
AnchorString: "Mailing Address:",
527-
FieldType: "text_optional",
528-
IsOptional: true,
529-
IsEditable: false,
530-
Width: 340,
531-
Height: 20,
532-
OffsetX: 0, // should be aligned with the above
533-
OffsetY: 48, // 47 should move down some
534-
},
535499
{
536500
ID: "country",
537501
Name: "Country",
@@ -741,9 +705,6 @@ var templateMap = map[string]models.Template{
741705
742706
<p>Please sign: __________________________________ Date: _______________ </p>
743707
<p>Full name: __________________________________________________________ </p>
744-
<p>Mailing Address: ____________________________________________________ </p>
745-
<p>_____________________________________________________________________ </p>
746-
<p>_____________________________________________________________________ </p>
747708
<p>Country: ________________________________________</p>
748709
<p>E-Mail: _________________________________________</p>
749710
</body></html>
@@ -821,42 +782,6 @@ var templateMap = map[string]models.Template{
821782
OffsetX: 65,
822783
OffsetY: -8,
823784
},
824-
{
825-
ID: "mailing_address1",
826-
Name: "Mailing Address",
827-
AnchorString: "Mailing Address:",
828-
FieldType: "text_unlocked",
829-
IsOptional: false,
830-
IsEditable: false,
831-
Width: 300,
832-
Height: 20,
833-
OffsetX: 105,
834-
OffsetY: -7,
835-
},
836-
{
837-
ID: "mailing_address2",
838-
Name: "Mailing Address",
839-
AnchorString: "Mailing Address:",
840-
FieldType: "text_unlocked",
841-
IsOptional: false,
842-
IsEditable: false,
843-
Width: 340,
844-
Height: 20,
845-
OffsetX: 0,
846-
OffsetY: 22,
847-
},
848-
{
849-
ID: "mailing_address3",
850-
Name: "Mailing Address",
851-
AnchorString: "Mailing Address:",
852-
FieldType: "text_optional",
853-
IsOptional: true,
854-
IsEditable: false,
855-
Width: 340,
856-
Height: 20,
857-
OffsetX: 0, // should be aligned with the above
858-
OffsetY: 50,
859-
},
860785
{
861786
ID: "country",
862787
Name: "Country",
@@ -1066,9 +991,6 @@ var templateMap = map[string]models.Template{
1066991
1067992
<p>Please sign: __________________________________ Date: _______________ </p>
1068993
<p>Full name: __________________________________________________________ </p>
1069-
<p>Mailing Address: ____________________________________________________ </p>
1070-
<p>_____________________________________________________________________ </p>
1071-
<p>_____________________________________________________________________ </p>
1072994
<p>Country: ________________________________________</p>
1073995
<p>E-Mail: _________________________________________</p>
1074996
</body></html>

‎cla-backend/cla/resources/cncf-individual-cla.html‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ <h3 class="legal-entity-name" style="text-align: center">
66
{{document_type}} Contributor License Agreement ("Agreement") v{{major_version}}.{{minor_version}}
77
</h3>
88
<p>Thank you for your interest in the Cloud Native Computing Foundation project (“CNCF”) of The Linux Foundation (the "Foundation"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Foundation must have a Contributor License Agreement ("CLA") on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of CNCF, the Foundation and its users; it does not change your rights to use your own Contributions for any other purpose. </p>
9-
<p>If you have not already done so, please complete and sign this Agreement using the electronic signature portal made available to you by the Foundation or its third-party service providers, or email a PDF of the signed agreement to [email protected]. Please read this document carefully before signing and keep a copy for your records.</p>
9+
<p>If you have not already done so, please complete and sign this Agreement using the electronic signature portal made available to you by the Foundation or its third-party service providers, or open a ticket at cncf.io/ccla and attach the scanned form. Please read this document carefully before signing and keep a copy for your records.</p>
1010
<p>Full name: ______________________________________________________</p>
1111
<p>Public name: ____________________________________________________</p>
12-
<p>Mailing Address: _________________________________________________</p>
13-
<p>_______________________________________________________________</p>
1412
<p>Country: ________________________________________________________</p>
1513
<p>Telephone: ______________________________________________________</p>
1614
<p>E-Mail: ________________________________________________________</p>

‎cla-backend/cla/resources/contract_templates.py‎

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -79,26 +79,6 @@ def get_tabs(self):
7979
'width': 345,
8080
'height': 20,
8181
'page': 1},
82-
{'type': 'text_unlocked',
83-
'id': 'mailing_address_1',
84-
'name': 'Mailing Address1',
85-
'anchor_string': 'Mailing Address:',
86-
'anchor_ignore_if_not_present': 'true',
87-
'anchor_x_offset': 117,
88-
'anchor_y_offset': -7,
89-
'width': 325,
90-
'height': 20,
91-
'page': 1},
92-
{'type': 'text_unlocked',
93-
'id': 'mailing_address_2',
94-
'name': 'Mailing Address2',
95-
'anchor_string': 'Mailing Address:',
96-
'anchor_ignore_if_not_present': 'true',
97-
'anchor_x_offset': 0,
98-
'anchor_y_offset': 29,
99-
'width': 420,
100-
'height': 20,
101-
'page': 1},
10282
{'type': 'text_unlocked',
10383
'id': 'country',
10484
'name': 'Country',
@@ -304,26 +284,6 @@ def get_tabs(self):
304284
'width': 345,
305285
'height': 20,
306286
'page': 1},
307-
{'type': 'text_unlocked',
308-
'id': 'mailing_address_1',
309-
'name': 'Mailing Address1',
310-
'anchor_string': 'Mailing Address:',
311-
'anchor_ignore_if_not_present': 'true',
312-
'anchor_x_offset': 117,
313-
'anchor_y_offset': -7,
314-
'width': 325,
315-
'height': 20,
316-
'page': 1},
317-
{'type': 'text_unlocked',
318-
'id': 'mailing_address_2',
319-
'name': 'Mailing Address2',
320-
'anchor_string': 'Mailing Address:',
321-
'anchor_ignore_if_not_present': 'true',
322-
'anchor_x_offset': 0,
323-
'anchor_y_offset': 29,
324-
'width': 420,
325-
'height': 20,
326-
'page': 1},
327287
{'type': 'text_unlocked',
328288
'id': 'country',
329289
'name': 'Country',
@@ -621,22 +581,6 @@ def get_tabs(self):
621581
'width': 345,
622582
'height': 20,
623583
'page': 1},
624-
{'type': 'text_unlocked',
625-
'id': 'mailing_address_1',
626-
'name': 'Mailing Address1',
627-
'position_x': 140,
628-
'position_y': 353,
629-
'width': 325,
630-
'height': 20,
631-
'page': 1},
632-
{'type': 'text_unlocked',
633-
'id': 'mailing_address_2',
634-
'name': 'Mailing Address2',
635-
'position_x': 55,
636-
'position_y': 381,
637-
'width': 420,
638-
'height': 20,
639-
'page': 1},
640584
{'type': 'text_unlocked',
641585
'id': 'country',
642586
'name': 'Country',
@@ -907,22 +851,6 @@ def get_tabs(self):
907851
'width': 345,
908852
'height': 20,
909853
'page': 1},
910-
{'type': 'text_unlocked',
911-
'id': 'mailing_address_1',
912-
'name': 'Mailing Address1',
913-
'position_x': 140,
914-
'position_y': 353,
915-
'width': 325,
916-
'height': 20,
917-
'page': 1},
918-
{'type': 'text_unlocked',
919-
'id': 'mailing_address_2',
920-
'name': 'Mailing Address2',
921-
'position_x': 55,
922-
'position_y': 381,
923-
'width': 420,
924-
'height': 20,
925-
'page': 1},
926854
{'type': 'text_unlocked',
927855
'id': 'country',
928856
'name': 'Country',
@@ -1090,22 +1018,6 @@ def get_tabs(self):
10901018
'width': 345,
10911019
'height': 20,
10921020
'page': 1},
1093-
{'type': 'text_unlocked',
1094-
'id': 'mailing_address_1',
1095-
'name': 'Mailing Address1',
1096-
'position_x': 140,
1097-
'position_y': 371,
1098-
'width': 325,
1099-
'height': 20,
1100-
'page': 1},
1101-
{'type': 'text_unlocked',
1102-
'id': 'mailing_address_2',
1103-
'name': 'Mailing Address2',
1104-
'position_x': 55,
1105-
'position_y': 399,
1106-
'width': 420,
1107-
'height': 20,
1108-
'page': 1},
11091021
{'type': 'text_unlocked',
11101022
'id': 'country',
11111023
'name': 'Country',

‎cla-backend/cla/resources/onap-individual-cla.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ <h3 class="legal-entity-name" style="text-align: center">
99
<br />
1010
<p>Full name: ______________________________________________________</p>
1111
<p>Public name: ____________________________________________________</p>
12-
<p>Mailing Address: _________________________________________________</p>
13-
<p>_______________________________________________________________</p>
1412
<p>Country: ________________________________________________________</p>
1513
<p>Telephone: ______________________________________________________</p>
1614
<p>E-Mail: ________________________________________________________</p>

‎cla-backend/cla/resources/openbmc-individual-cla.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ <h3 class="legal-entity-name" style="text-align: center">
99
<br />
1010
<p>Full name: ______________________________________________________</p>
1111
<p>Public name: ____________________________________________________</p>
12-
<p>Mailing Address: _________________________________________________</p>
13-
<p>_______________________________________________________________</p>
1412
<p>Country: ________________________________________________________</p>
1513
<p>Telephone: ______________________________________________________</p>
1614
<p>E-Mail: ________________________________________________________</p>

‎cla-backend/cla/resources/tekton-individual-cla.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ <h3 class="legal-entity-name" style="text-align: center">
99
<br />
1010
<p>Full name: ______________________________________________________</p>
1111
<p>Public name: ____________________________________________________</p>
12-
<p>Mailing Address: _________________________________________________</p>
13-
<p>_______________________________________________________________</p>
1412
<p>Country: ________________________________________________________</p>
1513
<p>Telephone: ______________________________________________________</p>
1614
<p>E-Mail: ________________________________________________________</p>

‎cla-backend/cla/resources/tungsten-fabric-individual-cla.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ <h3 class="legal-entity-name" style="text-align: center">
99
<br />
1010
<p>Full name: ______________________________________________________</p>
1111
<p>Public name: ____________________________________________________</p>
12-
<p>Mailing Address: _________________________________________________</p>
13-
<p>_______________________________________________________________</p>
1412
<p>Country: ________________________________________________________</p>
1513
<p>Telephone: ______________________________________________________</p>
1614
<p>E-Mail: ________________________________________________________</p>

‎cla-backend/cla/tests/unit/test_docusign_models.py‎

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -54,42 +54,6 @@
5454
<PageNumber>3</PageNumber>
5555
<CustomTabType>Text</CustomTabType>
5656
</TabStatus>
57-
<TabStatus>
58-
<TabType>Custom</TabType>
59-
<Status>Signed</Status>
60-
<XPosition>281</XPosition>
61-
<YPosition>227</YPosition>
62-
<TabLabel>mailing_address1</TabLabel>
63-
<TabName>Mailing Address</TabName>
64-
<TabValue>asdf</TabValue>
65-
<DocumentID>22317</DocumentID>
66-
<PageNumber>3</PageNumber>
67-
<CustomTabType>Text</CustomTabType>
68-
</TabStatus>
69-
<TabStatus>
70-
<TabType>Custom</TabType>
71-
<Status>Signed</Status>
72-
<XPosition>116</XPosition>
73-
<YPosition>277</YPosition>
74-
<TabLabel>mailing_address2</TabLabel>
75-
<TabName>Mailing Address</TabName>
76-
<TabValue>asdf</TabValue>
77-
<DocumentID>22317</DocumentID>
78-
<PageNumber>3</PageNumber>
79-
<CustomTabType>Text</CustomTabType>
80-
</TabStatus>
81-
<TabStatus>
82-
<TabType>Custom</TabType>
83-
<Status>Signed</Status>
84-
<XPosition>116</XPosition>
85-
<YPosition>331</YPosition>
86-
<TabLabel>mailing_address3</TabLabel>
87-
<TabName>Mailing Address</TabName>
88-
<TabValue>asdf</TabValue>
89-
<DocumentID>22317</DocumentID>
90-
<PageNumber>3</PageNumber>
91-
<CustomTabType>Text</CustomTabType>
92-
</TabStatus>
9357
<TabStatus>
9458
<TabType>Custom</TabType>
9559
<Status>Signed</Status>
@@ -147,15 +111,6 @@
147111
<field name="full_name">
148112
<value>Example FullName</value>
149113
</field>
150-
<field name="mailing_address1">
151-
<value>asdf</value>
152-
</field>
153-
<field name="mailing_address2">
154-
<value>asdf</value>
155-
</field>
156-
<field name="mailing_address3">
157-
<value>asdf</value>
158-
</field>
159114
<field name="country">
160115
<value>Bulgaria</value>
161116
</field>
@@ -272,42 +227,6 @@
272227
<PageNumber>3</PageNumber>
273228
<CustomTabType>Text</CustomTabType>
274229
</TabStatus>
275-
<TabStatus>
276-
<TabType>Custom</TabType>
277-
<Status>Signed</Status>
278-
<XPosition>281</XPosition>
279-
<YPosition>227</YPosition>
280-
<TabLabel>mailing_address1</TabLabel>
281-
<TabName>Mailing Address</TabName>
282-
<TabValue>asdf</TabValue>
283-
<DocumentID>22317</DocumentID>
284-
<PageNumber>3</PageNumber>
285-
<CustomTabType>Text</CustomTabType>
286-
</TabStatus>
287-
<TabStatus>
288-
<TabType>Custom</TabType>
289-
<Status>Signed</Status>
290-
<XPosition>116</XPosition>
291-
<YPosition>277</YPosition>
292-
<TabLabel>mailing_address2</TabLabel>
293-
<TabName>Mailing Address</TabName>
294-
<TabValue>asdf</TabValue>
295-
<DocumentID>22317</DocumentID>
296-
<PageNumber>3</PageNumber>
297-
<CustomTabType>Text</CustomTabType>
298-
</TabStatus>
299-
<TabStatus>
300-
<TabType>Custom</TabType>
301-
<Status>Signed</Status>
302-
<XPosition>116</XPosition>
303-
<YPosition>331</YPosition>
304-
<TabLabel>mailing_address3</TabLabel>
305-
<TabName>Mailing Address</TabName>
306-
<TabValue>asdf</TabValue>
307-
<DocumentID>22317</DocumentID>
308-
<PageNumber>3</PageNumber>
309-
<CustomTabType>Text</CustomTabType>
310-
</TabStatus>
311230
<TabStatus>
312231
<TabType>Custom</TabType>
313232
<Status>Signed</Status>
@@ -360,15 +279,6 @@
360279
<field name="full_name">
361280
<value>Example FullName</value>
362281
</field>
363-
<field name="mailing_address1">
364-
<value>asdf</value>
365-
</field>
366-
<field name="mailing_address2">
367-
<value>asdf</value>
368-
</field>
369-
<field name="mailing_address3">
370-
<value>asdf</value>
371-
</field>
372282
<field name="country">
373283
<value>Bulgaria</value>
374284
</field>

0 commit comments

Comments
 (0)