Minor changes in Latest reviewers panel and in the general system settings that the panel concern.

This commit is contained in:
Emil Siverhall 2011-07-13 15:48:03 +02:00
parent 2c9928ea08
commit 70145e8f5f
5 changed files with 15 additions and 13 deletions

@ -22,7 +22,7 @@
<td><input type="checkbox" wicket:id="peerDisplayLatestReviews" name="peerDisplayLatestReviews"></td>
</tr>
<tr>
<td><label for="numberOfLatestReviewsDisplayed">Number of reviews to show in the "Latest reviews" panel: </label></td>
<td><label for="numberOfLatestReviewsDisplayed">Number of reviews to show in the "Latest reviewers" panel: </label></td>
<td><input type="text" wicket:id="numberOfLatestReviewsDisplayed" name="numberOfLatestReviewsDisplayed" /></td>
</tr>
</table>

@ -59,6 +59,8 @@ public class AdminPeerSettingsPage extends AbstractAdminSettingsPage {
private class PeerRatingsSettingsForm extends Form<GeneralSystemSettings> {
private static final long serialVersionUID = 1L;
private TextField<Integer> numberOfLatestReviewsDisplayed;
public PeerRatingsSettingsForm(String id, IModel<GeneralSystemSettings> model) {
super(id, model);
@ -70,14 +72,18 @@ public class AdminPeerSettingsPage extends AbstractAdminSettingsPage {
CheckBox peerDisplayLatestReviews = new CheckBox("peerDisplayLatestReviews");
add(peerDisplayLatestReviews);
TextField<Integer> numberOfLatestReviewsDisplayed =
numberOfLatestReviewsDisplayed =
new TextField<Integer>("numberOfLatestReviewsDisplayed");
numberOfLatestReviewsDisplayed.setRequired(true);
add(numberOfLatestReviewsDisplayed);
}
@Override
public void onSubmit(){
setModelObject(generalSystemSettingsDao.save(getModelObject()));
if (getModelObject().getNumberOfLatestReviewsDisplayed() == 0) {
warn("Number of reviews to show has been changed to 1. If you don't want to show any reviews, please hide the panel.");
getModelObject().setNumberOfLatestReviewsDisplayed(1);
}
setModelObject(generalSystemSettingsDao.save(getModelObject()));
}
}

@ -9,7 +9,7 @@
<td wicket:id="reviewer"></td>
</tr>
<tr>
<td wicket:id="reviewDate"></td>
<td>Review date: <span wicket:id="reviewDate"></span></td>
</tr>
</tbody>
</table>

@ -42,23 +42,19 @@ public class LatestReviewPanel extends Panel {
@Override
protected List<PeerReview> load() {
return peerReviewDao.findReviewsSortedByDate(0,
model.getObject());
return peerReviewDao.findReviewsSortedByDate(0, model.getObject());
}
};
final ListView<PeerReview> listView = new ListView<PeerReview>(
"listView", listModel) {
final ListView<PeerReview> listView = new ListView<PeerReview>("listView", listModel) {
private static final long serialVersionUID = 1L;
@Override
protected void populateItem(ListItem<PeerReview> item) {
PeerReview pr = item.getModelObject();
DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
item.add(new Label("reviewDate", "Review date: "
+ df.format(pr.getLastModified())));
item.add(pr.getReviewer().getUser()
.getDisplayComponent("reviewer"));
item.add(pr.getReviewer().getUser().getDisplayComponent("reviewer"));
item.add(new Label("reviewDate", df.format(pr.getLastModified())));
add(item);
}
};

@ -74,7 +74,7 @@
<div class="span-6 last">
<wicket:enclosure>
<div class="rounded-box">
<span class="box-title">Latest reviews</span>
<span class="box-title">Latest reviewers</span>
<div wicket:id="latestReviewPanel" class="append-bottom"></div>
</div>
</wicket:enclosure>