Skip to content
Permalink
Browse files

Merge pull request #3046 from daniel-beck/JENKINS-32623

[JENKINS-32623] Use real URL for user
  • Loading branch information...
daniel-beck committed Oct 2, 2017
2 parents f3398ea + 4a52423 commit 4109c5b32780357e52d2154c8d3f82436408c1b8
Showing with 42 additions and 35 deletions.
  1. +7 −0 core/src/main/java/hudson/model/Cause.java
  2. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description.jelly
  3. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description.properties
  4. +2 −2 core/src/main/resources/hudson/model/Cause/UserIdCause/description_bg.properties
  5. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_ca.properties
  6. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_cs.properties
  7. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_da.properties
  8. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_de.properties
  9. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_el.properties
  10. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_es.properties
  11. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_fi.properties
  12. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_fr.properties
  13. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_he.properties
  14. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_hu.properties
  15. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_it.properties
  16. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_ja.properties
  17. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_ko.properties
  18. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_lt.properties
  19. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_lv.properties
  20. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_nb_NO.properties
  21. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_nl.properties
  22. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_pl.properties
  23. +2 −2 core/src/main/resources/hudson/model/Cause/UserIdCause/description_pt_BR.properties
  24. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_pt_PT.properties
  25. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_ru.properties
  26. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_sk.properties
  27. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_sl.properties
  28. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_sr.properties
  29. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_sv_SE.properties
  30. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_tr.properties
  31. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_uk.properties
  32. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_zh_CN.properties
  33. +1 −1 core/src/main/resources/hudson/model/Cause/UserIdCause/description_zh_TW.properties
  34. +1 −1 core/src/main/resources/lib/layout/layout.jelly
@@ -31,6 +31,8 @@
import hudson.diagnosis.OldDataMonitor;
import hudson.util.XStream2;
import jenkins.model.Jenkins;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.DoNotUse;
import org.kohsuke.stapler.export.Exported;
import org.kohsuke.stapler.export.ExportedBean;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
@@ -410,6 +412,11 @@ public String getUserName() {
return userId == null ? "anonymous" : User.get(userId).getDisplayName();
}

@Restricted(DoNotUse.class) // for Jelly
public String getUserUrl() {
return userId == null ? null : User.get(userId).getUrl();
}

@Override
public String getShortDescription() {
return Messages.Cause_UserIdCause_ShortDescription(getUserName());
@@ -25,7 +25,7 @@ THE SOFTWARE.
<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">
<j:choose>
<j:when test="${it.userId != null}" >
<span>${%started_by_user(it.userId, it.userName, rootURL)}</span>
<span>${%started_by_user(it.userUrl, it.userName, rootURL)}</span>
</j:when>
<j:otherwise>
<span>${%started_by_anonymous}</span>
@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

started_by_user=Started by user <a href="{2}/user/{0}">{1}</a>
started_by_user=Started by user <a href="{2}/{0}">{1}</a>
started_by_anonymous=Started by anonymous user
@@ -21,6 +21,6 @@
# THE SOFTWARE.

started_by_anonymous=\
\u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u043e \u043e\u0442 \u0430\u043d\u043e\u043d\u0438\u043c\u0435\u043d \u043f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b
\u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043D\u043E \u043E\u0442 \u0430\u043D\u043E\u043D\u0438\u043C\u0435\u043D \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B
started_by_user=\
\u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u043e \u043e\u0442 \u043f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u044f <a href="{2}/user/{0}">{1}</a>
\u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043D\u043E \u043E\u0442 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u044F <a href="{2}/{0}">{1}</a>
@@ -1,3 +1,3 @@
# This file is under the MIT License by authors

started_by_user=Iniciada per <a href="{2}/user/{0}">{1}</a>
started_by_user=Iniciada per <a href="{2}/{0}">{1}</a>
@@ -21,4 +21,4 @@
# THE SOFTWARE.

started_by_anonymous=Spu\u0161t\u011Bno anonymn\u00EDm u\u017Eivatelem
started_by_user=Spu\u0161t\u011Bn u\u017Eivatelem <a href="{2}/user/{0}">{1}</a>
started_by_user=Spu\u0161t\u011Bn u\u017Eivatelem <a href="{2}/{0}">{1}</a>
@@ -21,4 +21,4 @@
# THE SOFTWARE.

started_by_anonymous=Startet af annonym bruger
started_by_user=Startet af brugeren <a href="{2}/user/{0}">{1}</a>
started_by_user=Startet af brugeren <a href="{2}/{0}">{1}</a>
@@ -21,5 +21,5 @@
# THE SOFTWARE.

started_by_anonymous=Gestartet durch anonymes Benutzerkonto
started_by_user=Gestartet durch Benutzer <a href="{2}/user/{0}">{1}</a>
started_by_user=Gestartet durch Benutzer <a href="{2}/{0}">{1}</a>

@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

started_by_user=\u03A4\u03BF \u03BE\u03B5\u03BA\u03AF\u03BD\u03B7\u03C3\u03B5 \u03BF \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7\u03C2 <a href="{2}/user/{0}">{1}</a>
started_by_user=\u03A4\u03BF \u03BE\u03B5\u03BA\u03AF\u03BD\u03B7\u03C3\u03B5 \u03BF \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7\u03C2 <a href="{2}/{0}">{1}</a>
@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

started_by_user=Iniciado por el usuario <a href="{2}/user/{0}">{1}</a>
started_by_user=Iniciado por el usuario <a href="{2}/{0}">{1}</a>
started_by_anonymous=Iniciada por usuario anonymous
@@ -21,4 +21,4 @@
# THE SOFTWARE.

started_by_anonymous=Anonyymin k\u00E4ytt\u00E4j\u00E4n k\u00E4ynnist\u00E4m\u00E4
started_by_user=K\u00E4ynnist\u00E4j\u00E4: <a href="{2}/user/{0}">{1}</a>
started_by_user=K\u00E4ynnist\u00E4j\u00E4: <a href="{2}/{0}">{1}</a>
@@ -21,5 +21,5 @@
# THE SOFTWARE.

started_by_anonymous=Lanc\u00E9 par un utilisateur anonyme
started_by_user=Lanc\u00e9 par l''utilisateur <a href="{2}/user/{0}">{1}</a>
started_by_user=Lanc\u00e9 par l''utilisateur <a href="{2}/{0}">{1}</a>

@@ -1,3 +1,3 @@
# This file is under the MIT License by authors

started_by_user=\u05D4\u05D5\u05E4\u05E2\u05DC \u05E2\u05DC \u05D9\u05D3\u05D9 \u05DE\u05E9\u05EA\u05DE\u05E9 Started by user <a href="{2}/user/{0}">{1}</a>
started_by_user=\u05D4\u05D5\u05E4\u05E2\u05DC \u05E2\u05DC \u05D9\u05D3\u05D9 \u05DE\u05E9\u05EA\u05DE\u05E9 Started by user <a href="{2}/{0}">{1}</a>
@@ -1,4 +1,4 @@
# This file is under the MIT License by authors

started_by_anonymous=Ismeretlen felhaszn\u00E1l\u00F3 \u00E1ltal ind\u00EDtva
started_by_user=Elind\u00EDtva <a href="{2}/user/{0}">{1}</a> \u00E1ltal.
started_by_user=Elind\u00EDtva <a href="{2}/{0}">{1}</a> \u00E1ltal.
@@ -21,4 +21,4 @@
# THE SOFTWARE.

started_by_anonymous=Avviata da un utente anonimo
started_by_user=Avviato da utente <a href="{2}/user/{0}">{1}</a>
started_by_user=Avviato da utente <a href="{2}/{0}">{1}</a>
@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

started_by_user=\u30e6\u30fc\u30b6\u30fc<a href="{2}/user/{0}">{1}</a>\u304c\u5b9f\u884c
started_by_user=\u30e6\u30fc\u30b6\u30fc<a href="{2}/{0}">{1}</a>\u304c\u5b9f\u884c
started_by_anonymous=\u533f\u540d\u30e6\u30fc\u30b6\u30fc\u304c\u5b9f\u884c
@@ -21,4 +21,4 @@
# THE SOFTWARE.

started_by_anonymous=\uC775\uBA85 \uC0AC\uC6A9\uC790\uC5D0 \uC758\uD574 \uC2DC\uC791\uB428
started_by_user=\uc0ac\uc6a9\uc790 <a href="{2}/user/{0}">{1}</a>\uc5d0 \uc758\ud574 \uc2dc\uc791\ub428
started_by_user=\uc0ac\uc6a9\uc790 <a href="{2}/{0}">{1}</a>\uc5d0 \uc758\ud574 \uc2dc\uc791\ub428
@@ -1,3 +1,3 @@
# This file is under the MIT License by authors

started_by_user=Prad\u0117jo nautotojas <a href="{2}/user/{0}">{1}</a>
started_by_user=Prad\u0117jo nautotojas <a href="{2}/{0}">{1}</a>
@@ -21,4 +21,4 @@
# THE SOFTWARE.

started_by_anonymous=S\u0101kts ar anon\u012Bmu lietot\u0101ju
started_by_user=Ticis uzs\u0101kts p\u0113c <a href="{2}/user/{0}">{1}</a> izsaukuma
started_by_user=Ticis uzs\u0101kts p\u0113c <a href="{2}/{0}">{1}</a> izsaukuma
@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

started_by_user=Startet av bruker <a href="{2}/user/{0}">{1}</a>
started_by_user=Startet av bruker <a href="{2}/{0}">{1}</a>
@@ -21,4 +21,4 @@
# THE SOFTWARE.

started_by_anonymous=Gestart door een anonieme gebruiker
started_by_user=Gestart door <a href="{2}/user/{0}">{1}</a>
started_by_user=Gestart door <a href="{2}/{0}">{1}</a>
@@ -21,4 +21,4 @@
# THE SOFTWARE.

started_by_anonymous=Uruchomiono przez anonimowego u\u017Cytkownika
started_by_user=Wystartowane przez u\u017Cytkownika <a href="{2}/user/{0}">{1}</a>
started_by_user=Wystartowane przez u\u017Cytkownika <a href="{2}/{0}">{1}</a>
@@ -20,6 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

# Started by user <a href="{2}/user/{0}">{1}</a>
# Started by user <a href="{2}/{0}">{1}</a>
started_by_anonymous=Iniciado pelo usu\u00E1rio an\u00F4nimo
started_by_user=Iniciado pelo(a) usu\u00E1rio(a) <a href="{2}/user/{0}">{1}</a>
started_by_user=Iniciado pelo(a) usu\u00E1rio(a) <a href="{2}/{0}">{1}</a>
@@ -1,4 +1,4 @@
# This file is under the MIT License by authors

started_by_anonymous=Iniciada por anonymous user
started_by_user=Iniciado pelo utilizador <a href="{2}/user/{0}">{1}</a>
started_by_user=Iniciado pelo utilizador <a href="{2}/{0}">{1}</a>
@@ -21,4 +21,4 @@
# THE SOFTWARE.

started_by_anonymous=\u0417\u0430\u043F\u0443\u0449\u0435\u043D\u043E \u0430\u043D\u043E\u043D\u0438\u043C\u043D\u043E
started_by_user=\u0421\u043E\u0437\u0434\u0430\u043D\u0430 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C <a href="{2}/user/{0}">{1}</a>
started_by_user=\u0421\u043E\u0437\u0434\u0430\u043D\u0430 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C <a href="{2}/{0}">{1}</a>
@@ -21,4 +21,4 @@
# THE SOFTWARE.

started_by_anonymous=Spusten\u00FD anonymn\u00FDm pou\u017E\u00EDvate\u013Eom
started_by_user=Spusten\u00E9 u\u017E\u00EDvate\u013Eom <a href="{2}/user/{0}">{1}</a>
started_by_user=Spusten\u00E9 u\u017E\u00EDvate\u013Eom <a href="{2}/{0}">{1}</a>
@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

started_by_user=Spro\u017eil uporabnik <a greh="{2}/user/{0}">{1}</a>
started_by_user=Spro\u017eil uporabnik <a greh="{2}/{0}">{1}</a>
@@ -1,4 +1,4 @@
# This file is under the MIT License by authors

started_by_user=\u041F\u043E\u043A\u0440\u0435\u043D\u0443\u0442 \u043E\u0434 \u043A\u043E\u0440\u0438\u0441\u043D\u0438\u043A\u0430 <a href="{2}/user/{0}">{1}</a>
started_by_user=\u041F\u043E\u043A\u0440\u0435\u043D\u0443\u0442 \u043E\u0434 \u043A\u043E\u0440\u0438\u0441\u043D\u0438\u043A\u0430 <a href="{2}/{0}">{1}</a>
started_by_anonymous=\u041F\u043E\u043A\u0440\u0435\u043D\u0443\u0442\u043E \u0430\u043D\u043E\u043D\u0438\u043C\u043D\u0438\u043C \u043A\u043E\u0440\u0438\u0441\u043D\u0438\u043A\u043E\u043C
@@ -21,4 +21,4 @@
# THE SOFTWARE.

started_by_anonymous=Startad av en anonym anv\u00E4ndare
started_by_user=Startad av anv\u00e4ndare <a href="{2}/user/{0}">{1}</a>
started_by_user=Startad av anv\u00e4ndare <a href="{2}/{0}">{1}</a>
@@ -1,4 +1,4 @@
# This file is under the MIT License by authors

started_by_anonymous=isimsiz kullan\u0131c\u0131 tarafindan ba\u015Flat\u0131ld\u0131
started_by_user=<a href="{2}/user/{0}">{1}</a> kullan\u0131c\u0131s\u0131 taraf\u0131ndan ba\u015Flat\u0131ld\u0131
started_by_user=<a href="{2}/{0}">{1}</a> kullan\u0131c\u0131s\u0131 taraf\u0131ndan ba\u015Flat\u0131ld\u0131
@@ -21,4 +21,4 @@
# THE SOFTWARE.

started_by_anonymous=\u0437\u0430\u043F\u0443\u0449\u0435\u043D\u043E \u0430\u043D\u043E\u043D\u0456\u043C\u043D\u0438\u043C \u044E\u0437\u0435\u0440\u043E\u043C
started_by_user=\u0417\u0430\u043F\u0443\u0449\u0435\u043D\u043E \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0435\u043C <a href="{2}/user/{0}">{1}</a>
started_by_user=\u0417\u0430\u043F\u0443\u0449\u0435\u043D\u043E \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0435\u043C <a href="{2}/{0}">{1}</a>
@@ -21,4 +21,4 @@
# THE SOFTWARE.

started_by_anonymous=\u7531\u533F\u540D\u7528\u6237\u89E6\u53D1
started_by_user=\u542f\u52a8\u7528\u6237<a href="{2}/user/{0}">{1}</a>
started_by_user=\u542f\u52a8\u7528\u6237<a href="{2}/{0}">{1}</a>
@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

started_by_user=\u7531\u4f7f\u7528\u8005 <a href="{2}/user/{0}">{1}</a> \u555f\u52d5
started_by_user=\u7531\u4f7f\u7528\u8005 <a href="{2}/{0}">{1}</a> \u555f\u52d5
started_by_anonymous=\u7531\u533f\u540d\u4f7f\u7528\u8005\u555f\u52d5
@@ -204,7 +204,7 @@ ${h.initPageVariables(context)}
</j:otherwise>
</j:choose>
<span style="white-space:nowrap">
<a href="${rootURL}/user/${user.id}" class="model-link inside inverse"><b>${userName}</b></a>
<a href="${rootURL}/${user.url}" class="model-link inside inverse"><b>${userName}</b></a>
<j:if test="${app.securityRealm.canLogOut()}">
|
<a href="${rootURL}/logout"><b>${%logout}</b></a>

0 comments on commit 4109c5b

Please sign in to comment.
You can’t perform that action at this time.