Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 1056 → Rev 1057

/hostadmiral/trunk/src/ak/hostadmiral/core/taglib/LocaleOptionsTag.java
12,11 → 12,12
 
import ak.hostadmiral.core.Locales;
import ak.hostadmiral.core.model.User;
import ak.hostadmiral.core.servlet.SessionKeys;
 
public class LocaleOptionsTag extends OptionsTag
{
protected static MessageResources coreMessages =
MessageResources.getMessageResources("ak.hostadmiral.core.CoreResources");
protected static MessageResources pageMessages =
MessageResources.getMessageResources("ak.hostadmiral.core.resources.PageMessages");
 
public int doEndTag() throws JspException
{
25,7 → 26,7
throw new JspException(messages.getMessage("optionsTag.select"));
}
 
User user = (User)pageContext.getSession().getAttribute("user");
User user = (User)pageContext.getSession().getAttribute(SessionKeys.USER);
if(user == null) throw new JspException("no user found");
Locale userLocale = user.getLocale();
 
/hostadmiral/trunk/src/ak/hostadmiral/core/taglib/permission/RightTagBase.java
8,6 → 8,7
 
import ak.hostadmiral.core.model.User;
import ak.hostadmiral.core.model.ModelObject;
import ak.hostadmiral.core.servlet.SessionKeys;
 
public abstract class RightTagBase
extends TagSupport
37,7 → 38,7
public int doStartTag()
throws JspException
{
user = (User)RequestUtils.lookup(pageContext, "user", "session");
user = (User)RequestUtils.lookup(pageContext, SessionKeys.USER, "session");
 
Object obj = RequestUtils.lookup(pageContext, name, null);
if(obj == null)
/hostadmiral/trunk/src/ak/hostadmiral/core/taglib/CountryTag.java
5,6 → 5,7
import javax.servlet.jsp.tagext.TagSupport;
 
import ak.hostadmiral.core.model.User;
import ak.hostadmiral.core.servlet.SessionKeys;
 
public class CountryTag
extends TagSupport
12,7 → 13,7
public int doStartTag()
throws JspException
{
User user = (User)pageContext.getSession().getAttribute("user");
User user = (User)pageContext.getSession().getAttribute(SessionKeys.USER);
 
if(user == null)
throw new JspException("no user found");
/hostadmiral/trunk/src/ak/hostadmiral/core/taglib/LanguageTag.java
5,6 → 5,7
import javax.servlet.jsp.tagext.TagSupport;
 
import ak.hostadmiral.core.model.User;
import ak.hostadmiral.core.servlet.SessionKeys;
 
public class LanguageTag
extends TagSupport
12,7 → 13,7
public int doStartTag()
throws JspException
{
User user = (User)pageContext.getSession().getAttribute("user");
User user = (User)pageContext.getSession().getAttribute(SessionKeys.USER);
 
if(user == null)
throw new JspException("no user found");
/hostadmiral/trunk/src/ak/hostadmiral/core/taglib/ModelObjectOptionsTag.java
18,7 → 18,7
public class ModelObjectOptionsTag extends OptionsTag
{
protected static MessageResources coreMessages =
MessageResources.getMessageResources("ak.hostadmiral.core.CoreResources");
MessageResources.getMessageResources("ak.hostadmiral.core.resources.CoreMessages");
 
public int doEndTag() throws JspException
{
/hostadmiral/trunk/webapp/deleting.jsp
18,18 → 18,36
 
<h1><bean:message key="ak.hostadmiral.page.deleting.title" /></h1>
 
<p>Object: <bean:write name="object" property="identKey" /> <bean:write name="object" property="id" /></p>
<p>Action: <bean:write name="action" /></p>
<p>
Deleting <strutsx:message name="object" property="typeKey" />
<em><strutsx:message name="object" property="identKey" valuesProperty="identParams" /></em>
</p>
 
<p>FIXME: draw a real object tree here</p>
<p>
Following changes will be done is system as cascade effect of deleting the object:
</p>
<ul>
<%
Collection cascade = (Collection)request.getAttribute("cascade");
 
for(Iterator i = cascade.iterator(); i.hasNext(); ) {
CascadeDeleteElement e = (CascadeDeleteElement)i.next();
Stack stack = new Stack();
Iterator i = cascade.iterator();
 
while(true) {
if(!i.hasNext()) {
if(stack.isEmpty()) {
break;
}
else {
i = (Iterator)stack.pop();
%></ul><%
continue;
}
}
 
CascadeDeleteElement e = (CascadeDeleteElement)i.next();
 
pageContext.setAttribute("e", e);
 
%><li>
<logic:equal name="e" property="effect" value="1">
FORBIDDEN
42,8 → 60,13
</logic:equal>
<strutsx:message name="e" property="object.typeKey" />
<em><strutsx:message name="e" property="object.identKey" valuesProperty="object.identParams" /></em>
<bean:write name="e" property="cascade" />
</li><%
 
if(e.getCascade() != null) {
stack.push(i);
i = e.getCascade().iterator();
%><ul><%
}
}
%>
</ul>
52,7 → 75,7
<backpath:currentlink action="<%= (String)request.getAttribute("action") %>" paramId="id" paramName="object" paramProperty="id"><bean:message key="ak.hostadmiral.page.deleting.delete" /></backpath:currentlink>
<backpath:backlink><bean:message key="ak.hostadmiral.page.deleting.back" /></backpath:backlink>
 
<p>
<p>
<bean:message key="ak.hostadmiral.page.general.version" />:
<bean:write name="projectVersion" />
</p>