inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moderated Site invites now visible in My Tasks dashlet

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2009-04-06 20:52:47 +00:00
parent a166add97f
commit 440f9808e8
5 changed files with 261 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/bootstrap/invite/moderated-reject-email.ftl
View File

@@ -1,7 +1,7 @@
Your request to join site '${resourceName}' has not been approved.
'${reviewComments}'
<#if reviewComments??>'${reviewComments}'</#if>
Regards,
Alfresco Share Team

300
config/alfresco/template-services-context.xml
View File

@@ -1,144 +1,156 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<bean id="templateService" class="org.alfresco.repo.processor.TemplateServiceImpl">
<property name="defaultTemplateEngine">
<value>freemarker</value>
</property>
<property name="nodeService">
<ref bean="NodeService"/>
</property>
</bean>
<bean id="baseTemplateProcessor" abstract="true" init-method="register">
<property name="templateService">
<ref bean="templateService"/>
</property>
<property name="serviceRegistry">
<ref bean="ServiceRegistry"/>
</property>
</bean>
<!-- The beans are not thread safe and therefore we create one per request -->
<bean id="freeMarkerProcessor" parent="baseTemplateProcessor" class="org.alfresco.repo.template.FreeMarkerProcessor">
<property name="name">
<value>freemarker</value>
</property>
<property name="extension">
<value>ftl</value>
</property>
</bean>
<!-- base config implementation that template extension beans extend from - for auto registration
as a global template helper with the TemplateService -->
<bean id="baseTemplateImplementation" abstract="true" init-method="register">
<property name="processor">
<ref bean="freeMarkerProcessor"/>
</property>
</bean>
<bean id="avmExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.AVM">
<property name="extensionName">
<value>avm</value>
</property>
<property name="serviceRegistry">
<ref bean="ServiceRegistry"/>
</property>
</bean>
<bean id="sessionTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.Session">
<property name="extensionName">
<value>session</value>
</property>
<property name="serviceRegistry">
<ref bean="ServiceRegistry"/>
</property>
</bean>
<bean id="classificationTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.Classification">
<property name="extensionName">
<value>classification</value>
</property>
<property name="storeUrl">
<value>${spaces.store}</value>
</property>
<property name="serviceRegistry">
<ref bean="ServiceRegistry"/>
</property>
</bean>
<bean id="workflowTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.Workflow">
<property name="extensionName">
<value>workflow</value>
</property>
<property name="serviceRegistry">
<ref bean="ServiceRegistry"/>
</property>
</bean>
<bean id="peopleTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.People">
<property name="extensionName">
<value>people</value>
</property>
<property name="storeUrl">
<value>${spaces.store}</value>
</property>
<property name="serviceRegistry">
<ref bean="ServiceRegistry"/>
</property>
<property name="authorityDAO">
<ref bean="authorityDAO"/>
</property>
<property name="authorityService">
<ref bean="AuthorityService"/>
</property>
<property name="personService">
<ref bean="PersonService"/>
</property>
</bean>
<bean id="hasAspectTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.HasAspectMethod">
<property name="extensionName">
<value>hasAspect</value>
</property>
</bean>
<bean id="hasPermissionTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.HasPermissionMethod">
<property name="extensionName">
<value>hasPermission</value>
</property>
</bean>
<bean id="messageTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.I18NMessageMethod">
<property name="extensionName">
<value>message</value>
</property>
</bean>
<bean id="dateCompareTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.DateCompareMethod">
<property name="extensionName">
<value>dateCompare</value>
</property>
</bean>
<bean id="incrementDateTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.DateIncrementMethod">
<property name="extensionName">
<value>incrementDate</value>
</property>
</bean>
<bean id="xmlDateTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.ISO8601DateFormatMethod">
<property name="extensionName">
<value>xmldate</value>
</property>
</bean>
<bean id="cropContentTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.CropContentMethod">
<property name="extensionName">
<value>cropContent</value>
</property>
</bean>
</beans>
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<bean id="templateService" class="org.alfresco.repo.processor.TemplateServiceImpl">
<property name="defaultTemplateEngine">
<value>freemarker</value>
</property>
<property name="nodeService">
<ref bean="NodeService"/>
</property>
</bean>
<bean id="baseTemplateProcessor" abstract="true" init-method="register">
<property name="templateService">
<ref bean="templateService"/>
</property>
<property name="serviceRegistry">
<ref bean="ServiceRegistry"/>
</property>
</bean>
<!-- The beans are not thread safe and therefore we create one per request -->
<bean id="freeMarkerProcessor" parent="baseTemplateProcessor" class="org.alfresco.repo.template.FreeMarkerProcessor">
<property name="name">
<value>freemarker</value>
</property>
<property name="extension">
<value>ftl</value>
</property>
</bean>
<!-- base config implementation that template extension beans extend from - for auto registration
as a global template helper with the TemplateService -->
<bean id="baseTemplateImplementation" abstract="true" init-method="register">
<property name="processor">
<ref bean="freeMarkerProcessor"/>
</property>
</bean>
<bean id="avmExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.AVM">
<property name="extensionName">
<value>avm</value>
</property>
<property name="serviceRegistry">
<ref bean="ServiceRegistry"/>
</property>
</bean>
<bean id="sessionTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.Session">
<property name="extensionName">
<value>session</value>
</property>
<property name="serviceRegistry">
<ref bean="ServiceRegistry"/>
</property>
</bean>
<bean id="classificationTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.Classification">
<property name="extensionName">
<value>classification</value>
</property>
<property name="storeUrl">
<value>${spaces.store}</value>
</property>
<property name="serviceRegistry">
<ref bean="ServiceRegistry"/>
</property>
</bean>
<bean id="workflowTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.Workflow">
<property name="extensionName">
<value>workflow</value>
</property>
<property name="serviceRegistry">
<ref bean="ServiceRegistry"/>
</property>
</bean>
<bean id="peopleTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.People">
<property name="extensionName">
<value>people</value>
</property>
<property name="storeUrl">
<value>${spaces.store}</value>
</property>
<property name="serviceRegistry">
<ref bean="ServiceRegistry"/>
</property>
<property name="authorityDAO">
<ref bean="authorityDAO"/>
</property>
<property name="authorityService">
<ref bean="AuthorityService"/>
</property>
<property name="personService">
<ref bean="PersonService"/>
</property>
</bean>
<bean id="siteTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.Site">
<property name="extensionName">
<value>site</value>
</property>
<property name="serviceRegistry">
<ref bean="ServiceRegistry"/>
</property>
<property name="siteService">
<ref bean="SiteService"/>
</property>
</bean>
<bean id="hasAspectTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.HasAspectMethod">
<property name="extensionName">
<value>hasAspect</value>
</property>
</bean>
<bean id="hasPermissionTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.HasPermissionMethod">
<property name="extensionName">
<value>hasPermission</value>
</property>
</bean>
<bean id="messageTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.I18NMessageMethod">
<property name="extensionName">
<value>message</value>
</property>
</bean>
<bean id="dateCompareTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.DateCompareMethod">
<property name="extensionName">
<value>dateCompare</value>
</property>
</bean>
<bean id="incrementDateTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.DateIncrementMethod">
<property name="extensionName">
<value>incrementDate</value>
</property>
</bean>
<bean id="xmlDateTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.ISO8601DateFormatMethod">
<property name="extensionName">
<value>xmldate</value>
</property>
</bean>
<bean id="cropContentTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.CropContentMethod">
<property name="extensionName">
<value>cropContent</value>
</property>
</bean>
</beans>

40
config/alfresco/workflow/invitation-moderated-workflow-messages.properties
View File

@@ -4,24 +4,28 @@
# Moderated Invitation
#
wf_invitation-moderated.workflow.title=Invitation - Moderated
wf_invitation-moderated.workflow.description=Moderated invitation to a resource such as a web site.
imwf_invitation-moderated.workflow.title=Invitation - Moderated
imwf_invitation-moderated.workflow.description=Moderated invitation to a resource such as a web site.
wf_invitation-moderated-workflow-model.type.wf_moderatedInvitationSubmitTask.title=Start Invitation
wf_invitation-moderated-workflow-model.type.wf_moderatedInvitationSubmitTask=Start a moderated invitation
imwf_invitation-moderated-workflow-model.type.imwf_moderatedInvitationReviewTask.title=Moderated Site Invitation
imwf_invitation-moderated-workflow-model.type.imwf_moderatedInvitationReviewTask.description=Start a moderated invitation
wf_invitation-moderated-model.type.approveInvitationTask.title=Approve Invitation
wf_invitation-moderated-model.type.approveInvitationTask.description=Approve Invitation
imwf_invitation-moderated-model.type.approveInvitationTask.title=Approve Invitation
imwf_invitation-moderated-model.type.approveInvitationTask.description=Approve Invitation
wf_invitation-moderated.node.start.title=Start
wf_invitation-moderated.node.start.description=Start moderated invitation
wf_invitation-moderated.node.review.title=Review Invitation
wf_invitation-moderated.node.review.description=Review moderated invitation
wf_invitation-moderated.node.review.transition.reject.title=Reject
wf_invitation-moderated.node.review.transition.reject.description=Reject
wf_invitation-moderated.node.review.transition.approve.title=Approve
wf_invitation-moderated.node.review.transition.approve.description=Approve
wf_invitation-moderated.node.review.transition.cancel.title=Cancel
wf_invitation-moderated.node.review.transition.cancel.description=Cancel
wf_invitation-moderated.node.end.title=End
wf_invitation-moderated.node.end.description=End
imwf_invitation-moderated.node.start.title=Start
imwf_invitation-moderated.node.start.description=Start moderated invitation
imwf_invitation-moderated.task.imwf_moderatedInvitationSubmitTask.title=Start
imwf_invitation-moderated.task.imwf_moderatedInvitationSubmitTask.description=Start moderated invitation
imwf_invitation-moderated.node.review.title=Review Invitation
imwf_invitation-moderated.node.review.description=Review moderated invitation
imwf_invitation-moderated.task.imwf_moderatedInvitationReviewTask.title=Review Invitation
imwf_invitation-moderated.task.imwf_moderatedInvitationReviewTask.description=Review moderated invitation
imwf_invitation-moderated.node.review.transition.reject.title=Reject
imwf_invitation-moderated.node.review.transition.reject.description=Reject
imwf_invitation-moderated.node.review.transition.approve.title=Approve
imwf_invitation-moderated.node.review.transition.approve.description=Approve
imwf_invitation-moderated.node.review.transition.cancel.title=Cancel
imwf_invitation-moderated.node.review.transition.cancel.description=Cancel
imwf_invitation-moderated.node.end.title=End
imwf_invitation-moderated.node.end.description=End

13
config/alfresco/workflow/invitation-moderated_processdefinition.xml
View File

@@ -24,18 +24,17 @@
<task-node name="review">
<task name="imwf:moderatedInvitationReviewTask" swimlane="approver" />
<transition name="reject" to="rejected">
<action class="org.alfresco.repo.workflow.jbpm.AlfrescoJavaScript">
<script>
<transition name="approve" to="approved">
<action class="org.alfresco.repo.workflow.jbpm.AlfrescoJavaScript">
<script>
<variable name="imwf_reviewer" access="write" />
<expression>person.properties.userName</expression>
</script>
</action>
</transition>
<transition name="approve" to="approved">
<action class="org.alfresco.repo.workflow.jbpm.AlfrescoJavaScript">
<script>
<transition name="reject" to="rejected">
<action class="org.alfresco.repo.workflow.jbpm.AlfrescoJavaScript">
<script>
<variable name="imwf_reviewer" access="write" />
<expression>person.properties.userName</expression>
</script>

76
source/java/org/alfresco/repo/template/Site.java Normal file
View File

@@ -0,0 +1,76 @@
/*
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have received a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
package org.alfresco.repo.template;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.util.ParameterCheck;
/**
* Site support in FreeMarker templates.
*
* @author Mike Hatfield
*/
public class Site extends BaseTemplateProcessorExtension
{
/** Repository Service Registry */
private ServiceRegistry services;
private SiteService siteService;
/**
* Set the service registry
*
* @param serviceRegistry the service registry
*/
public void setServiceRegistry(ServiceRegistry serviceRegistry)
{
this.services = serviceRegistry;
}
/**
* Set the site service
*
* @param siteService The siteService to set.
*/
public void setSiteService(SiteService siteService)
{
this.siteService = siteService;
}
/**
* Gets the SiteInfo given the shortName
*
* @param shortName the shortName of the Site to get
* @return the Site or null if no such site exists
*/
public SiteInfo getSiteInfo(String shortName)
{
ParameterCheck.mandatoryString("shortName", shortName);
return siteService.getSite(shortName);
}
}