-
-
Notifications
You must be signed in to change notification settings - Fork 8.7k
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.
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
Admin monitor message: separation between content and display #3416
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
urlIsNull=Jenkins root URL is empty but is required for the proper operation of many Jenkins features like email notifications, \ | ||
PR status update, and environment variables such as <code>BUILD_URL</code>.<br />\ | ||
Please provide an accurate value in <a href="{0}/configure">Jenkins configuration</a>. | ||
PR status update, and environment variables such as <code>BUILD_URL</code>. | ||
urlIsInvalid=Jenkins root URL seems to be invalid. It is required for the proper operation of many Jenkins features like email notifications, \ | ||
PR status update, and environment variables such as <code>BUILD_URL</code>.<br />\ | ||
Please provide an accurate value in <a href="{0}/configure">Jenkins configuration</a>. | ||
PR status update, and environment variables such as <code>BUILD_URL</code>. | ||
actionToTake=Please provide an accurate value in {0}. | ||
actionUrlContent=Jenkins configuration |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,8 +22,19 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | |
THE SOFTWARE. | ||
--> | ||
<?jelly escape-by-default='true'?> | ||
<j:jelly xmlns:j="jelly:core"> | ||
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form"> | ||
<div class="alert alert-warning"> | ||
${%warningMessage(rootURL)} | ||
<form method="post" action="${rootURL}/${it.url}/disable"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is allowing this monitor to be dismissed important enough for a changelog entry? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't think as it's already possible by passing throught the configuration page, it's just a shortcut |
||
<f:submit value="${%Dismiss}"/> | ||
</form> | ||
<j:set var="referenceAnchor"> | ||
<a href="https://jenkins.io/redirect/csrf-protection" target="_blank">${%referenceUrlContent}</a> | ||
</j:set> | ||
<j:set var="actionAnchor"> | ||
<a href="${rootURL}/configureSecurity">${%actionUrlContent}</a> | ||
</j:set> | ||
<j:out value="${%warningMessage(referenceAnchor)}"/> | ||
<p /> | ||
<j:out value="${%actionMessage(actionAnchor)}"/> | ||
</div> | ||
</j:jelly> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
warningMessage=You have not configured the CSRF issuer. This could be a security issue. \ | ||
For more information, please refer to <a href="https://jenkins.io/redirect/csrf-protection" target="_blank">this page</a>. \ | ||
<br /> \ | ||
You can change the current configuration using the Security section <a href="{0}/configureSecurity">CSRF Protection</a>. | ||
For more information, please refer to {0}. | ||
actionMessage=You can change the current configuration using the Security section {0}. | ||
referenceUrlContent=this page | ||
actionUrlContent=CSRF Protection |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you don't need the null check on
loc
here than can you remove it fromisActivated
as well? Looks like it is@CheckForNull
so I think you want to add it back.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's already the case for
isActivated
and theJenkinsLocationConfiguration.get()
is@Nonnull
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was looking at an old version, this looks good to me. Sorry for the noise!