From 7bf171b4e8edbf085e2f11821c9140938f9b44a8 Mon Sep 17 00:00:00 2001
From: Fredrik Friis <fred-fri@dsv.su.se>
Date: Wed, 29 Feb 2012 11:47:34 +0900
Subject: [PATCH] removed project deletion because it causes problems at login
---
.../panels/ProjectManagementPanel.html | 8 +++----
.../panels/ProjectManagementPanel.java | 22 +++++++++----------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/project/panels/ProjectManagementPanel.html b/src/main/java/se/su/dsv/scipro/project/panels/ProjectManagementPanel.html
index 0a9d1c0ef5..ad49fe2bcd 100644
--- a/src/main/java/se/su/dsv/scipro/project/panels/ProjectManagementPanel.html
+++ b/src/main/java/se/su/dsv/scipro/project/panels/ProjectManagementPanel.html
@@ -45,8 +45,8 @@
<th>Supervisor</th>
<th>Reviewer</th>
<th>Status</th>
- <th>Edit</th>
- <th class="rounded-right-top">Delete</th>
+ <th class="rounded-right-top">Edit</th>
+<!-- <th class="rounded-right-top">Delete</th> -->
</tr>
</thead>
<tfoot>
@@ -64,12 +64,12 @@
<td wicket:id="statusLabel">Other role</td>
<!-- <td wicket:id="editLabel">Other role</td> -->
<td><a href="#" wicket:id="testLink">Edit</a></td>
- <td><a href="#" wicket:id="deleteLink">Delete</a></td>
+<!-- <td><a href="#" wicket:id="deleteLink">Delete</a></td> -->
</tr>
</tbody>
<tbody>
<tr>
- <td wicket:id="emptyLabel" colspan="8"></td>
+ <td wicket:id="emptyLabel" colspan="7"></td>
</tr>
</tbody>
</table>
diff --git a/src/main/java/se/su/dsv/scipro/project/panels/ProjectManagementPanel.java b/src/main/java/se/su/dsv/scipro/project/panels/ProjectManagementPanel.java
index 3afb6f9b6d..3b136a761d 100644
--- a/src/main/java/se/su/dsv/scipro/project/panels/ProjectManagementPanel.java
+++ b/src/main/java/se/su/dsv/scipro/project/panels/ProjectManagementPanel.java
@@ -130,17 +130,17 @@ public class ProjectManagementPanel extends Panel {
};
item.add(testLink);
- AjaxLink deleteLink = new AjaxLink<Void>("deleteLink"){
- private static final long serialVersionUID = 1L;
- @Override
- public void onClick(AjaxRequestTarget target) {
- Project p2 = projectDao.reLoad(p);
- projectDao.delete(p2);
- ajaxRefresh(target);
- }
-
- };
- item.add(deleteLink);
+// AjaxLink deleteLink = new AjaxLink<Void>("deleteLink"){
+// private static final long serialVersionUID = 1L;
+// @Override
+// public void onClick(AjaxRequestTarget target) {
+// Project p2 = projectDao.reLoad(p);
+// projectDao.delete(p2);
+// ajaxRefresh(target);
+// }
+//
+// };
+// item.add(deleteLink);
//>>>>>>> cascade
}