Skip to content
This repository has been archived by the owner on Apr 6, 2022. It is now read-only.

Commit

Permalink
Merge pull request #122 from pjdarton/hide-details-by-default
Browse files Browse the repository at this point in the history
[FIXED JENKINS-51336] Hide parser details by default
  • Loading branch information
uhafner committed May 19, 2018
2 parents b45e384 + c84eb95 commit febf22e
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 44 deletions.
@@ -1,27 +1,50 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<f:entry field="name" title="${%Name}" description="${%name.description}">
<f:textbox />
</f:entry>
<f:entry field="linkName" title="${%Link name}" description="${%linkName.description}">
<f:textbox />
</f:entry>
<f:entry field="trendName" title="${%Trend report name}" description="${%trendName.description}">
<f:textbox />
</f:entry>
<f:entry field="regexp" title="${%Regular Expression}" description="${%regexp.description}">
<f:textbox />
</f:entry>
<f:entry field="script" title="${%Mapping Script}" description="${%script.description}">
<f:textarea />
</f:entry>
<f:entry field="example" title="${%Example Log Message}" description="${%example.description}">
<f:textarea />
</f:entry>
<f:entry title="">
<div align="right">
<f:repeatableDeleteButton />
</div>
</f:entry>
</j:jelly>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<f:entry field="name" title="${%Name}" description="${%name.description}">
<f:textbox />
</f:entry>
<j:choose>
<j:when test="${!instance.valid}">
<f:entry field="linkName" title="${%Link name}" description="${%linkName.description}">
<f:textbox />
</f:entry>
<f:entry field="trendName" title="${%Trend report name}" description="${%trendName.description}">
<f:textbox />
</f:entry>
<f:entry field="regexp" title="${%Regular Expression}" description="${%regexp.description}">
<f:textbox />
</f:entry>
<f:entry field="script" title="${%Mapping Script}" description="${%script.description}">
<f:textarea />
</f:entry>
<f:entry field="example" title="${%Example Log Message}" description="${%example.description}">
<f:textarea />
</f:entry>
</j:when>
<j:otherwise>
<f:advanced title="${%Details}" align="left">
<f:entry field="linkName" title="${%Link name}" description="${%linkName.description}">
<f:textbox />
</f:entry>
<f:entry field="trendName" title="${%Trend report name}" description="${%trendName.description}">
<f:textbox />
</f:entry>
<f:entry field="regexp" title="${%Regular Expression}" description="${%regexp.description}">
<f:textbox />
</f:entry>
<f:entry field="script" title="${%Mapping Script}" description="${%script.description}">
<f:textarea />
</f:entry>
<f:entry field="example" title="${%Example Log Message}" description="${%example.description}">
<f:textarea />
</f:entry>
</f:advanced>
</j:otherwise>
</j:choose>
<f:entry title="">
<div align="right">
<f:repeatableDeleteButton />
</div>
</f:entry>
</j:jelly>
Expand Up @@ -13,6 +13,7 @@ example.description=Beispielmeldung, die automatisch mit den oben angegebenen We
Link\ name=Name des Ergebnislinks
Trend\ report\ name=Name des Trends
Name=Name
Details=Einzelheiten
Regular\ Expression=Regulärer Ausdruck
Mapping\ Script=Auswertungs-Skript
Example\ Log\ Message=Beispielmeldung
@@ -1,4 +1,5 @@
Name=\u540d\u524d
Details=\u8a73\u7d30
Link\ name=\u30ea\u30f3\u30af\u540d
Trend\ report\ name=\u63a8\u79fb\u30ec\u30dd\u30fc\u30c8\u540d
Regular\ Expression=\u6b63\u898f\u8868\u73fe
Expand Down
@@ -1,18 +1,20 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:u="/util"
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<f:section title="${%Compiler Warnings}">
<j:choose>
<j:when test="${descriptor.canEditParsers()}">
<f:entry title="${%Parsers}" description="${%title.description}">
<u:repeatable field="parsers"/>
</f:entry>
</j:when>
<j:otherwise>
<f:block>
You have no permission to edit Groovy parsers (required permission: RUN_SCRIPTS).
</f:block>
</j:otherwise>
</j:choose>
</f:section>
</j:jelly>
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:u="/util"
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<f:section title="${%Compiler Warnings}">
<j:choose>
<j:when test="${descriptor.canEditParsers()}">
<f:advanced title="${%Parsers}" align="left">
<f:entry title="${%Parsers}" description="${%title.description}">
<u:repeatable field="parsers"/>
</f:entry>
</f:advanced>
</j:when>
<j:otherwise>
<f:block>
You have no permission to edit Groovy parsers (required permission: RUN_SCRIPTS).
</f:block>
</j:otherwise>
</j:choose>
</f:section>
</j:jelly>

0 comments on commit febf22e

Please sign in to comment.