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

Fixups to portlet webscripts that hardcore the '/service' part of webscript urls to use ${url.serviceContext} and push down into appropriate javascripts

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5883 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-06-07 14:29:14 +00:00
parent c53842aa33
commit 9aa5b881c7
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl
View File

@@ -90,7 +90,7 @@
<div id="spacePanel"> <div id="spacePanel">
<#-- populated via an AJAX call to 'myspacespanel' webscript --> <#-- populated via an AJAX call to 'myspacespanel' webscript -->
<#-- resolved path, filter and home.noderef required as arguments --> <#-- resolved path, filter and home.noderef required as arguments -->
<script>MySpaces.Path="${path?replace("\"","\\\"")}";MySpaces.Filter="${filter}";MySpaces.Home="${home.nodeRef}";</script> <script>MySpaces.ServiceContext="${url.serviceContext}";MySpaces.Path="${path?replace("\"","\\\"")}";MySpaces.Filter="${filter}";MySpaces.Home="${home.nodeRef}";</script>
</div> </div>
<div class="spaceFooter"> <div class="spaceFooter">
<#-- the count value is retrieved and set dynamically from the AJAX webscript output above --> <#-- the count value is retrieved and set dynamically from the AJAX webscript output above -->

2
config/alfresco/templates/webscripts/org/alfresco/portlets/myspacespanel.get.html.ftl
View File

@@ -14,7 +14,7 @@
<#if d.isDocument> <#if d.isDocument>
<a href="${url.context}${d.url}" target="new" onclick="event.cancelBubble=true"><img class="spaceIconImage" alt="" width="16" height="16" src="${url.context}${d.icon16?replace(".gif",".png")}" border=0></a> <a href="${url.context}${d.url}" target="new" onclick="event.cancelBubble=true"><img class="spaceIconImage" alt="" width="16" height="16" src="${url.context}${d.icon16?replace(".gif",".png")}" border=0></a>
<#else> <#else>
<a href="${scripturl("${url.context}/service/myspaces?f=${args.f}&p=${args.p}/${d.name}", false)}"><img class="spaceIconImage" alt="" width="16" height="16" src="${url.context}${d.icon16?replace(".gif",".png")}" border="0" onclick="event.cancelBubble=true;"></a> <a href="${scripturl("${url.serviceContext}/myspaces?f=${args.f}&p=${args.p}/${d.name}", false)}"><img class="spaceIconImage" alt="" width="16" height="16" src="${url.context}${d.icon16?replace(".gif",".png")}" border="0" onclick="event.cancelBubble=true;"></a>
</#if> </#if>
<div style="display:none"><img class="spaceIconImage64" alt="" width="64" height="64" src="${url.context}${d.icon64}"></div> <div style="display:none"><img class="spaceIconImage64" alt="" width="64" height="64" src="${url.context}${d.icon64}"></div>
</div> </div>

2
config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks.get.html.ftl
View File

@@ -38,7 +38,7 @@
<div id="taskPanel"> <div id="taskPanel">
<#-- populated via an AJAX call to 'mytaskspanel' webscript --> <#-- populated via an AJAX call to 'mytaskspanel' webscript -->
<#-- resolved filter required as argument --> <#-- resolved filter required as argument -->
<script>MyTasks.Filter="${filter}";</script> <script>MyTasks.ServiceContext="${url.serviceContext}";MyTasks.Filter="${filter}";</script>
</div> </div>
</td> </td>
<td width=4 class="paperEdgeRight"><td> <td width=4 class="paperEdgeRight"><td>

3
source/web/scripts/ajax/myspaces.js
View File

@@ -9,6 +9,7 @@ var MySpaces = {
Path: null, Path: null,
Filter: null, Filter: null,
Home: null, Home: null,
ServiceContext: null,
popupPanel: null, popupPanel: null,
start: function() start: function()
@@ -19,7 +20,7 @@ var MySpaces = {
// is responsible for rendering just the contents of the main panel div // is responsible for rendering just the contents of the main panel div
YAHOO.util.Connect.asyncRequest( YAHOO.util.Connect.asyncRequest(
"GET", "GET",
getContextPath() + '/service/myspacespanel?p='+MySpaces.Path+'&f='+MySpaces.Filter+'&h='+MySpaces.Home, MySpaces.ServiceContext + '/myspacespanel?p='+MySpaces.Path+'&f='+MySpaces.Filter+'&h='+MySpaces.Home,
{ {
success: function(response) success: function(response)
{ {

3
source/web/scripts/ajax/mytasks.js
View File

@@ -2,6 +2,7 @@ var MyTasks = {
ANIM_LENGTH: 300, ANIM_LENGTH: 300,
DETAIL_PANEL_HEIGHT: 132, DETAIL_PANEL_HEIGHT: 132,
Filter: null, Filter: null,
ServiceContext: null,
start: function() start: function()
{ {
@@ -11,7 +12,7 @@ var MyTasks = {
// is responsible for rendering just the contents of the main panel div // is responsible for rendering just the contents of the main panel div
YAHOO.util.Connect.asyncRequest( YAHOO.util.Connect.asyncRequest(
"GET", "GET",
getContextPath() + '/service/mytaskspanel?f='+MyTasks.Filter, MyTasks.ServiceContext + '/mytaskspanel?f='+MyTasks.Filter,
{ {
success: function(response) success: function(response)
{ {