From c371cf2b1476f033dde26e83c8a5cfda4d895231 Mon Sep 17 00:00:00 2001
From: fred-fri <fred-fri@dsv.su.se>
Date: Fri, 11 May 2012 10:45:26 +0900
Subject: [PATCH] fixed some gui requests
---
.../su/dsv/scipro/admin/panels/match/ManageKeywordPanel.html | 2 +-
.../su/dsv/scipro/admin/panels/match/ManageKeywordPanel.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/match/ManageKeywordPanel.html b/src/main/java/se/su/dsv/scipro/admin/panels/match/ManageKeywordPanel.html
index 433a0d95ef..166a825b38 100644
--- a/src/main/java/se/su/dsv/scipro/admin/panels/match/ManageKeywordPanel.html
+++ b/src/main/java/se/su/dsv/scipro/admin/panels/match/ManageKeywordPanel.html
@@ -15,7 +15,7 @@
<table wicket:id="table" class="rounded-corner">
<thead>
<tr>
- <th class="rounded-left-top">Name</th><th>Keyword associations</th><th>Type</th><th>Active</th><th class="rounded-right-top">Edit</th>
+ <th class="rounded-left-top">Name</th><th><span wicket:id="keywordAssociationsLabel"></span></th><th>Type</th><th>Active</th><th class="rounded-right-top"><span wicket:id="editLabel"></span></th>
</tr>
</thead>
<tbody>
diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/match/ManageKeywordPanel.java b/src/main/java/se/su/dsv/scipro/admin/panels/match/ManageKeywordPanel.java
index 1647bcb4f4..71b8477b1c 100644
--- a/src/main/java/se/su/dsv/scipro/admin/panels/match/ManageKeywordPanel.java
+++ b/src/main/java/se/su/dsv/scipro/admin/panels/match/ManageKeywordPanel.java
@@ -79,6 +79,9 @@ public class ManageKeywordPanel extends Panel {
tableContainer = new WebMarkupContainer("table");
tableContainer.setOutputMarkupId(true);
+ tableContainer.add(new Label("keywordAssociationsLabel", "Keyword associations").setVisible(hasManageAssociations));
+ tableContainer.add(new Label("editLabel", "Edit").setVisible(isEditable));
+
keywordsDataView = new DataView<Keyword>("keywordsDataView", keywordsDataProvider) {
private static final long serialVersionUID = 1L;
@@ -181,7 +184,7 @@ public class ManageKeywordPanel extends Panel {
}
}.setVisible(hasManageAssociations));
- item.add(new Label("associationsCount", String.valueOf(item.getModelObject().getAssociatedKeywords().size())));
+ item.add(new Label("associationsCount", String.valueOf(item.getModelObject().getAssociatedKeywords().size())).setVisible(hasManageAssociations));
}