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

. Saved Searches UI improvements as suggested by Linton

Browse Source 
. Fix to quoted term search to allow quoted string of a single word only e.g. "baboon" (not very useful, but should at least work…!)
. Checkpoint of the Templating language enhancements ready for the addition of saved search support

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-01-17 11:57:32 +00:00
parent 97b2aaac93
commit e7ce03d4cf
14 changed files with 644 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
source/java/org/alfresco/web/ui/repo/component/template/DefaultModelHelper.java Normal file
View File

@@ -0,0 +1,107 @@
/*
* Copyright (C) 2005 Alfresco, Inc.
*
* Licensed under the Mozilla Public License version 1.1
* with a permitted attribution clause. You may obtain a
* copy of the License at
*
* http://www.alfresco.org/legal/license.txt
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific
* language governing permissions and limitations under the
* License.
*/
package org.alfresco.web.ui.repo.component.template;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import org.alfresco.repo.template.DateCompareMethod;
import org.alfresco.repo.template.HasAspectMethod;
import org.alfresco.repo.template.I18NMessageMethod;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.TemplateImageResolver;
import org.alfresco.service.cmr.repository.TemplateNode;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.bean.repository.User;
import org.alfresco.web.ui.common.Utils;
/**
* Helper class to generate the default template model.
* <p>
* See {@link http://www.alfresco.org/mediawiki/index.php/Template_Guide}
*
* @author Kevin Roast
*/
public class DefaultModelHelper
{
/**
* Private Constructor
*/
private DefaultModelHelper()
{
}
/**
* Construct the default FreeMarker template model.
* <p>
* Other root level objects such as the current Space or Document are generally
* added by the appropriate bean responsible for provided access to those nodes.
* <p>
* See {@link http://www.alfresco.org/mediawiki/index.php/Template_Guide}
*
* @return Map containing the default model.
*/
public static Map buildDefaultModel(ServiceRegistry services, User user)
{
if (services == null)
{
throw new IllegalArgumentException("ServiceRegistry is mandatory.");
}
if (user == null)
{
throw new IllegalArgumentException("Current User is mandatory.");
}
// create FreeMarker default model and merge
Map root = new HashMap(16, 1.0f);
// supply the CompanyHome space as "companyhome"
NodeRef companyRootRef = new NodeRef(Repository.getStoreRef(), Application.getCompanyRootId());
TemplateNode companyRootNode = new TemplateNode(companyRootRef, services, imageResolver);
root.put("companyhome", companyRootNode);
// supply the users Home Space as "userhome"
NodeRef userRootRef = new NodeRef(Repository.getStoreRef(), user.getHomeSpaceId());
TemplateNode userRootNode = new TemplateNode(userRootRef, services, imageResolver);
root.put("userhome", userRootNode);
// supply the current user Node as "person"
root.put("person", new TemplateNode(user.getPerson(), services, imageResolver));
// current date/time is useful to have and isn't supplied by FreeMarker by default
root.put("date", new Date());
// add custom method objects
root.put("hasAspect", new HasAspectMethod());
root.put("message", new I18NMessageMethod());
root.put("dateCompare", new DateCompareMethod());
return root;
}
/** Template Image resolver helper */
public static TemplateImageResolver imageResolver = new TemplateImageResolver()
{
public String resolveImagePathForName(String filename, boolean small)
{
return Utils.getFileTypeImage(filename, small);
}
};
}

32
source/java/org/alfresco/web/ui/repo/component/template/UITemplate.java
View File

@@ -191,33 +191,11 @@ public class UITemplate extends SelfRenderingComponent
if (getEngine().equals(ENGINE_DEFAULT))
{
// create FreeMarker default model and merge
Map root = new HashMap(11, 1.0f);
FacesContext context = FacesContext.getCurrentInstance();
ServiceRegistry services = Repository.getServiceRegistry(context);
// supply the CompanyHome space as "companyhome"
NodeRef companyRootRef = new NodeRef(Repository.getStoreRef(), Application.getCompanyRootId());
TemplateNode companyRootNode = new TemplateNode(companyRootRef, services, imageResolver);
root.put("companyhome", companyRootNode);
// supply the users Home Space as "userhome"
User user = Application.getCurrentUser(context);
NodeRef userRootRef = new NodeRef(Repository.getStoreRef(), user.getHomeSpaceId());
TemplateNode userRootNode = new TemplateNode(userRootRef, services, imageResolver);
root.put("userhome", userRootNode);
// supply the current user Node as "person"
root.put("person", new TemplateNode(user.getPerson(), services, imageResolver));
// current date/time is useful to have and isn't supplied by FreeMarker by default
root.put("date", new Date());
// add custom method objects
root.put("hasAspect", new HasAspectMethod());
root.put("message", new I18NMessageMethod());
root.put("dateCompare", new DateCompareMethod());
// create an instance of the default FreeMarker template object model
FacesContext fc = FacesContext.getCurrentInstance();
ServiceRegistry services = Repository.getServiceRegistry(fc);
User user = Application.getCurrentUser(fc);
Map root = DefaultModelHelper.buildDefaultModel(services, user);
// merge models
if (model instanceof Map)