added needed fields in models and needed libraries for frontend (#67)

This commit is contained in:
Athou
2013-06-01 21:00:10 +02:00
parent 33eb99b8c6
commit 7ffd044a86
11 changed files with 195 additions and 67 deletions

View File

@@ -35,6 +35,8 @@ public class FeedCategory extends AbstractModel {
private boolean collapsed;
private Integer position;
public String getName() {
return name;
}
@@ -86,4 +88,12 @@ public class FeedCategory extends AbstractModel {
this.collapsed = collapsed;
}
public Integer getPosition() {
return position;
}
public void setPosition(Integer position) {
this.position = position;
}
}

View File

@@ -33,6 +33,8 @@ public class FeedSubscription extends AbstractModel {
@OneToMany(mappedBy = "subscription", cascade = CascadeType.REMOVE)
private Set<FeedEntryStatus> statuses;
private Integer position;
public Feed getFeed() {
return feed;
}
@@ -73,4 +75,12 @@ public class FeedSubscription extends AbstractModel {
this.statuses = statuses;
}
public Integer getPosition() {
return position;
}
public void setPosition(Integer position) {
this.position = position;
}
}

View File

@@ -5,6 +5,8 @@ import java.util.List;
import javax.ejb.ApplicationException;
import javax.inject.Inject;
import org.apache.commons.lang.StringUtils;
import com.commafeed.backend.dao.FeedEntryDAO;
import com.commafeed.backend.dao.FeedEntryStatusDAO;
import com.commafeed.backend.dao.FeedSubscriptionDAO;
@@ -50,7 +52,7 @@ public class FeedSubscriptionService {
FeedCategory category) {
final String pubUrl = applicationSettingsService.get().getPublicUrl();
if (pubUrl == null) {
if (StringUtils.isBlank(pubUrl)) {
throw new FeedSubscriptionException(
"Public URL of this CommaFeed instance is not set");
}