Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master sg multiemail validate - INTO DEV #245

Closed
wants to merge 18 commits into from
Closed

Master sg multiemail validate - INTO DEV #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
910272b
Merge pull request #60 from GOCDB/dev
GRyall Nov 11, 2016
84b12dd
Merge pull request #63 from GOCDB/dev
GRyall Nov 22, 2016
8f76aba
Merge branch 'dev'
davidmeredith Dec 1, 2016
8b435d5
Merge branch 'dev' to include changeLog updates
davidmeredith Dec 16, 2016
361f3bb
Merge branch 'dev'
davidmeredith Jan 6, 2017
2546083
Merge pull request #69 from GOCDB/dev
GRyall Jan 27, 2017
d044a3b
Merge pull request #71 from GOCDB/dev
GRyall Feb 1, 2017
81b6d76
Merge pull request #73 from GOCDB/dev
GRyall Feb 1, 2017
02219b0
Merge pull request #75 from GOCDB/dev
GRyall Feb 2, 2017
9909097
Merge pull request #96 from GOCDB/dev
GRyall Oct 27, 2017
685ba3f
Merge pull request #97 from tofu-rocketry/spelling
GRyall Nov 6, 2017
a009354
Merge pull request #109 from GOCDB/dev
GRyall Mar 29, 2018
99c3878
Merge pull request #112 from GOCDB/dev
GRyall May 11, 2018
881e697
Merge pull request #145 from GOCDB/dev
gregcorbett Mar 21, 2019
9c3fe4a
Allow multiemail input for ServiceGroup EMAIL
nikoloutsa Apr 5, 2019
c5e7c6c
Match any number of emails
nikoloutsa Apr 8, 2019
2078f70
Change to email regex for service groups
GRyall Feb 3, 2020
3529b67
Update htdocs/web_portal/views/service_group/edit_service_group.php
GRyall Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/gocdb_schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@
<field>
<fname>EMAIL</fname>
<length>255</length>
<regex>/^([0-9a-zA-Z]+[-._])*[0-9a-zA-Z]+@([-0-9a-zA-Z]+[.])+[a-zA-Z]{2,6}$/</regex>
<regex>/^((([0-9a-zA-Z]+[-._])*[0-9a-zA-Z]+@([-0-9a-zA-Z]+[.])+[a-zA-Z]{2,6});)*(([0-9a-zA-Z]+[-._])*[0-9a-zA-Z]+@([-0-9a-zA-Z]+[.])+[a-zA-Z]{2,6});?$/</regex>
</field>
</entity>
<!-- ========================================================== -->
Expand Down
4 changes: 2 additions & 2 deletions htdocs/web_portal/views/service_group/edit_service_group.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<input type="text" value="<?php xecho($sg->getName()) ?>" name="name" class="input_input_text">
<span class="input_name">Description</span>
<input type="text" value="<?php xecho($sg->getDescription()) ?>" name="description" class="input_input_text">
<span class="input_name">Contact E-Mail *<span class="input_syntax" >(valid email format)</span></span>
<span class="input_name">Contact E-Mail *<span class="input_syntax" >(valid email format, semicolon separated without spaces)</span></span>
<input type="text" value="<?php xecho($sg->getEmail()) ?>" name="email" class="input_input_text">
<span class="input_name">Should this service group be Monitored?</span>
<input class="add_edit_form" style="width: auto; display: inline;" type="checkbox" name="monitored" value="" <?php if($sg->getMonitored() == true) echo " checked=\"checked\""; ?> />
Expand Down Expand Up @@ -41,4 +41,4 @@
'#optionalScopeCheckBoxDIV',
true);
});
</script>
</script>