git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@319 73ecded7-942e-4092-bab0-0e58ef0ee984
This commit is contained in:
joha-asc 2011-03-14 11:07:48 +00:00
parent 673809e981
commit 51b7734a46

@ -140,7 +140,7 @@ public class ResourcePage extends PublicPage {
Link link = new Link();
link.setInfo(resourceModel.getInfo());
link.setLink(resourceModel.getLink());
link.setUser(user);
link.setCreator(user);
link.setTagList(new ArrayList<Tag>(selectedTagList));
if (resourceModel.getLinkName() != null) {
link.setLinkName(resourceModel.getLinkName());
@ -232,7 +232,7 @@ public class ResourcePage extends PublicPage {
.getModelObject());
editLink.setInfo(resourceModel.getInfoEdit());
editLink.setLink(resourceModel.getLinkEdit());
editLink.setUser(user);
editLink.setCreator(user);
editLink.setTagList(new ArrayList<Tag>(selectedTagListEdit));
if (resourceModel.getLinkNameEdit() != null) {
editLink.setLinkName(resourceModel.getLinkNameEdit());
@ -345,8 +345,8 @@ public class ResourcePage extends PublicPage {
});
item.add(new Label("date", link.getDateCreated().toString()));
item.add(new Label("user", link.getUser().getFirstName() + " "
+ link.getUser().getLastName()));
item.add(new Label("user", link.getCreator().getFirstName() + " "
+ link.getCreator().getLastName()));
if (link.getLinkName() == null) {
item.add(new ExternalLink("link", link.getLink(), link
.getLink()));