Menu
▾
▴
[jtrac-svn] SF.net SVN: j-trac:[1479] trunk/jtrac
|
From: <udi...@us...> - 2023-06-08 09:49:29
|
Revision: 1479
http://sourceforge.net/p/j-trac/code/1479
Author: udittmer
Date: 2023-06-08 09:49:27 +0000 (Thu, 08 Jun 2023)
Log Message:
-----------
update Hsqldb, show ticket ID in title
Modified Paths:
--------------
trunk/jtrac/pom.xml
trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.html
trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.java
trunk/jtrac/src/main/java/info/jtrac/wicket/ItemFormPage.java
trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java
Modified: trunk/jtrac/pom.xml
===================================================================
--- trunk/jtrac/pom.xml 2023-06-01 08:06:21 UTC (rev 1478)
+++ trunk/jtrac/pom.xml 2023-06-08 09:49:27 UTC (rev 1479)
@@ -362,7 +362,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.7.1</version>
+ <version>2.7.2</version>
<classifier>jdk8</classifier>
<!-- 2.x can apparently not read DBs created with 1.8
<version>1.8.0.10</version>
Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.html
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.html 2023-06-01 08:06:21 UTC (rev 1478)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.html 2023-06-08 09:49:27 UTC (rev 1479)
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
- <title>JTrac</title>
+ <title wicket:id="title"></title>
<link rel="stylesheet" type="text/css" href="resources/jtrac.css"/>
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico"/>
<link rel="icon" type="image/x-icon" href="favicon.ico"/>
Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.java 2023-06-01 08:06:21 UTC (rev 1478)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/BasePage.java 2023-06-08 09:49:27 UTC (rev 1479)
@@ -82,6 +82,7 @@
add(new HeaderPanel().setRenderBodyOnly(true));
String jtracVersion = getJtrac().getReleaseVersion();
add(new Label("version", jtracVersion));
+ add(new Label("title", "JTrac"));
add(WebUtils.getColorChangeHeaderContributor());
}
}
Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/ItemFormPage.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/ItemFormPage.java 2023-06-01 08:06:21 UTC (rev 1478)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/ItemFormPage.java 2023-06-08 09:49:27 UTC (rev 1479)
@@ -30,6 +30,7 @@
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -67,6 +68,7 @@
*/
public ItemFormPage(long itemId) {
Item item = getJtrac().loadItem(itemId);
+ addOrReplace(new Label("title", "JTrac "+item.getRefId()));
add(new ItemForm("form", item));
}
@@ -93,11 +95,11 @@
feedback.setFilter(filter);
add(feedback);
version = item.getVersion();
-
+
if (item.getId() > 0) {
editMode = true;
}
-
+
BoundCompoundPropertyModel model = null;
if (editMode) {
/*
Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java 2023-06-01 08:06:21 UTC (rev 1478)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPage.java 2023-06-08 09:49:27 UTC (rev 1479)
@@ -31,6 +31,7 @@
import org.apache.wicket.PageParameters;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListView;
@@ -57,9 +58,10 @@
item = getJtrac().loadItem(Long.parseLong(refId));
}
itemId = item.getId(); // required for itemRelatePanel
+ addOrReplace(new Label("title", "JTrac "+item.getRefId()));
addComponents(item);
- }
-
+ }
+
private void addComponents(final Item item) {
final ItemSearch itemSearch = JtracSession.get().getItemSearch();
add(new ItemRelatePanel("relate", true, itemSearch));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
