|
From: <udi...@us...> - 2023-01-04 14:26:00
|
Revision: 1467
http://sourceforge.net/p/j-trac/code/1467
Author: udittmer
Date: 2023-01-04 14:25:59 +0000 (Wed, 04 Jan 2023)
Log Message:
-----------
updated dependencies, #186
Modified Paths:
--------------
trunk/jtrac/pom.xml
trunk/jtrac/src/main/java/info/jtrac/util/UserUtils.java
trunk/jtrac/src/main/java/info/jtrac/wicket/ItemFormPage.html
trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewFormPanel.java
Modified: trunk/jtrac/pom.xml
===================================================================
--- trunk/jtrac/pom.xml 2022-12-15 17:27:55 UTC (rev 1466)
+++ trunk/jtrac/pom.xml 2023-01-04 14:25:59 UTC (rev 1467)
@@ -67,7 +67,7 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.67.0</version>
+ <version>2.68.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -545,6 +545,6 @@
<maven.build.timestamp.format>yyyy-MM-dd HH:mm z</maven.build.timestamp.format>
<commonmark.version>0.21.0</commonmark.version>
<log4j2.version>2.19.0</log4j2.version>
- <slf4j.version>2.0.5</slf4j.version>
+ <slf4j.version>2.0.6</slf4j.version>
</properties>
</project>
Modified: trunk/jtrac/src/main/java/info/jtrac/util/UserUtils.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/util/UserUtils.java 2022-12-15 17:27:55 UTC (rev 1466)
+++ trunk/jtrac/src/main/java/info/jtrac/util/UserUtils.java 2023-01-04 14:25:59 UTC (rev 1467)
@@ -99,7 +99,15 @@
*/
public static void addInfoToName (User user) {
if (StringUtils.hasText(user.getInfo())) {
- user.setName(String.format("%s (%s)", user.getName(), user.getInfo()));
+ user.setName(getNameWithInfo(user));
}
}
+
+ public static String getNameWithInfo (User user) {
+ if (StringUtils.hasText(user.getInfo())) {
+ return String.format("%s (%s)", user.getName(), user.getInfo());
+ } else {
+ return user.getName();
+ }
+ }
}
Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/ItemFormPage.html
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/ItemFormPage.html 2022-12-15 17:27:55 UTC (rev 1466)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/ItemFormPage.html 2023-01-04 14:25:59 UTC (rev 1467)
@@ -13,7 +13,7 @@
<font color="red">*</font>
</td>
<td>
- <input wicket:id="summary" style="width:49.7em" maxlength="255"/>
+ <input wicket:id="summary" style="width: 60em" maxlength="255"/>
<input type="submit" wicket:id="delete" wicket:message="value:delete"/>
</td>
</tr>
Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewFormPanel.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewFormPanel.java 2022-12-15 17:27:55 UTC (rev 1466)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewFormPanel.java 2023-01-04 14:25:59 UTC (rev 1467)
@@ -143,7 +143,7 @@
List<ItemUser> choices = UserUtils.convertToItemUserList(userSpaceRoles);
ListMultipleChoice itemUsers = new JtracCheckBoxMultipleChoice("itemUsers", choices, new IChoiceRenderer() {
public Object getDisplayValue(Object o) {
- return ((ItemUser) o).getUser().getName();
+ return UserUtils.getNameWithInfo(((ItemUser) o).getUser());
}
public String getIdValue(Object o, int i) {
return ((ItemUser) o).getUser().getId() + "";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|