Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 72 → Rev 73

/impl/src/java/pt/estgp/estgweb/Globals.java
29,6 → 29,6
public static final int NUMBER_ANNOUNCEMENT_TYPE_TOP_FLASH_NEWS_INDEX=1;
public static final int NUMBER_ANNOUNCEMENT_TYPE_BOTTOM_FLASH_NEWS_INDEX=2;
public static final int ANNOUNCEMENT_TYPE_TOP_FLASH_NEWS_TIMEOUT=ConfigProperties.getIntProperty("announcements.top.flash.news.timeout.miliseconds");
public static final List<String> USER_ROLES = ConfigProperties.getListValues("user.role");
public static List<String> USER_ROLES = ConfigProperties.getListValues("user.role");
 
}
/impl/src/java/pt/estgp/estgweb/web/form/AddRolesForm.java
15,6 → 15,7
public class AddRolesForm extends ApplicationForm
{
 
public static final String TARGET_ROLES_KEY = "targetRoles";
protected String role;
protected static List<String> targetRoles = Globals.USER_ROLES;
protected List<String> selectedRoles;
30,6 → 31,16
}
 
 
public static List<String> getTargetRoles() {
return targetRoles;
}
 
public void setTargetRoles(List<String> roles)
{
 
}
 
 
public String getTargetRolesStr() {
return targetRolesStr;
}
/impl/src/java/pt/estgp/estgweb/web/form/announcements/AnnouncementsForm.java
25,8 → 25,8
{
 
private static final Logger logger = Logger.getLogger(AnnouncementsForm.class);
private static final String TARGET_ROLES_KEY = "targetRoles";
 
 
private AnnouncementView announcementView;
 
 
88,11 → 88,7
this.expireDate = expireDate;
}
 
public void setTargetRoles(List<String> roles)
{
 
}
 
public FormFile getBigImage() {
return bigImage;
}
/impl/src/java/pt/estgp/estgweb/web/controllers/AddRolesController.java
29,7 → 29,7
 
private static final Logger logger = Logger.getLogger(AddRolesController.class);
 
private static final String TARGET_ROLES_KEY = "targetRoles";
private static final String TARGET_ROLES_KEY = AddRolesForm.TARGET_ROLES_KEY;
 
public ActionForward start(ActionMapping mapping,
ActionForm form ,
/impl/src/java/pt/estgp/estgweb/web/controllers/announcements/AnnouncementsController.java
4,6 → 4,7
import org.apache.struts.upload.FormFile;
import org.apache.log4j.Logger;
import pt.estgp.estgweb.web.form.announcements.AnnouncementsForm;
import pt.estgp.estgweb.web.form.AddRolesForm;
import pt.estgp.estgweb.web.UserSessionProxy;
import pt.estgp.estgweb.web.controllers.AddRolesController;
import pt.estgp.estgweb.web.utils.RequestUtils;
34,7 → 35,7
 
private static final Logger logger = Logger.getLogger(AnnouncementsController.class);
private static final String TARGET_ROLES_KEY = "targetRoles";
private static final String TARGET_ROLES_KEY = AddRolesForm.TARGET_ROLES_KEY;
public ActionForward save(ActionMapping mapping,
ActionForm form ,
45,7 → 46,6
try
{
AnnouncementsForm announcementsForm = (AnnouncementsForm) form;
 
if(announcementsForm.getAnnouncementView().getId() <= 0)
{
Announcement a = DomainObjectFactory.createAnnouncementImpl();