Skip to content

Commit

Permalink
Revert "Merge pull request #146" (#307)
Browse files Browse the repository at this point in the history
- This reverts commit d181cf6,
  reversing changes made to
  5d6dea3.
- PR #146 was erroneously merged into master.
- I don't want this feature (Allow multi email input for
  Service Group EMAIL) in 5.7.6 as it is not part of that
  release branch so has not been tested in preproduction.
- PR #247 ensures the feature is in the dev branch. The feature is
  already part of the release-5.8.0 branch.
  • Loading branch information
gregcorbett committed Oct 15, 2021
1 parent d181cf6 commit 69c7e11
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion config/gocdb_schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,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});)*(([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}$/</regex>
</field>
</entity>
<!-- ========================================================== -->
Expand Down
4 changes: 2 additions & 2 deletions htdocs/web_portal/views/service_group/edit_service_group.php
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, semicolon separated without spaces)</span></span>
<span class="input_name">Contact E-Mail *<span class="input_syntax" >(valid email format)</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>

0 comments on commit 69c7e11

Please sign in to comment.