LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PDL adjusted to removal of old style application code. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2058 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2013-01-30 21:21:36 +00:00
parent c08bd0f73e
commit a6fda4180b
2 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
ccm-portalserver/pdl/com/arsdigita/portalserver/Workspace.pdl
View File

@ -86,7 +86,7 @@ query childWorkspacesForApplicationID {
workspace.displayName = acs_objects.display_name; workspace.displayName = acs_objects.display_name;
workspace.defaultDomainClass = acs_objects.default_domain_class; workspace.defaultDomainClass = acs_objects.default_domain_class;
workspace.parentResource.id = applications.parent_application_id; workspace.parentResource.id = applications.parent_application_id;
workspace.packageInstance.id = applications.package_id; // workspace.packageInstance.id = applications.package_id; (Old stype app code removed in 6.6.5)
workspace.title = applications.title; workspace.title = applications.title;
workspace.description = applications.description; workspace.description = applications.description;
workspace.primaryURL = applications.primary_url; workspace.primaryURL = applications.primary_url;
@ -106,7 +106,7 @@ query rootWorkspaces {
acs_objects.display_name, acs_objects.display_name,
acs_objects.default_domain_class, acs_objects.default_domain_class,
applications.parent_application_id, applications.parent_application_id,
applications.package_id, // applications.package_id,
applications.title, applications.title,
applications.description, applications.description,
applications.primary_url, applications.primary_url,
@ -129,7 +129,7 @@ query rootWorkspaces {
workspace.displayName = acs_objects.display_name; workspace.displayName = acs_objects.display_name;
workspace.defaultDomainClass = acs_objects.default_domain_class; workspace.defaultDomainClass = acs_objects.default_domain_class;
workspace.parentResource.id = applications.parent_application_id; workspace.parentResource.id = applications.parent_application_id;
workspace.packageInstance.id = applications.package_id; // workspace.packageInstance.id = applications.package_id;
workspace.title = applications.title; workspace.title = applications.title;
workspace.description = applications.description; workspace.description = applications.description;
workspace.primaryURL = applications.primary_url; workspace.primaryURL = applications.primary_url;
@ -139,49 +139,49 @@ query rootWorkspaces {
} }
} }
query workspaceForSiteNodeID { // (pb) query workspaceForSiteNodeID {
Workspace workspace; // (pb) Workspace workspace;
// (pb)
do { // (pb) do {
select // (pb) select
acs_objects.object_id, // (pb) acs_objects.object_id,
acs_objects.object_type, // (pb) acs_objects.object_type,
acs_objects.display_name, // (pb) acs_objects.display_name,
acs_objects.default_domain_class, // (pb) acs_objects.default_domain_class,
applications.parent_application_id, // (pb) applications.parent_application_id,
applications.package_id, // (pb) applications.package_id,
applications.title, // (pb) applications.title,
applications.description, // (pb) applications.description,
applications.primary_url, // (pb) applications.primary_url,
ps_workspaces.ready_p, // (pb) ps_workspaces.ready_p,
ps_workspaces.mission // (pb) ps_workspaces.mission
from // (pb) from
site_nodes, // (pb) site_nodes,
apm_packages, // (pb) apm_packages,
applications, // (pb) applications,
acs_objects, // (pb) acs_objects,
ps_workspaces // (pb) ps_workspaces
where // (pb) where
site_nodes.node_id = :siteNodeID // (pb) site_nodes.node_id = :siteNodeID
-- joins // (pb) -- joins
and site_nodes.object_id = apm_packages.package_id // (pb) and site_nodes.object_id = apm_packages.package_id
and apm_packages.package_id = applications.package_id // (pb) and apm_packages.package_id = applications.package_id
and applications.application_id = acs_objects.object_id // (pb) and applications.application_id = acs_objects.object_id
and applications.application_id = ps_workspaces.workspace_id // (pb) and applications.application_id = ps_workspaces.workspace_id
} map { // (pb) } map {
workspace.id = acs_objects.object_id; // (pb) workspace.id = acs_objects.object_id;
workspace.objectType = acs_objects.object_type; // (pb) workspace.objectType = acs_objects.object_type;
workspace.displayName = acs_objects.display_name; // (pb) workspace.displayName = acs_objects.display_name;
workspace.defaultDomainClass = acs_objects.default_domain_class; // (pb) workspace.defaultDomainClass = acs_objects.default_domain_class;
workspace.parentResource.id = applications.parent_application_id; // (pb) workspace.parentResource.id = applications.parent_application_id;
workspace.packageInstance.id = applications.package_id; // (pb) workspace.packageInstance.id = applications.package_id;
workspace.title = applications.title; // (pb) workspace.title = applications.title;
workspace.description = applications.description; // (pb) workspace.description = applications.description;
workspace.primaryURL = applications.primary_url; // (pb) workspace.primaryURL = applications.primary_url;
workspace.isReady = ps_workspaces.ready_p; // (pb) workspace.isReady = ps_workspaces.ready_p;
workspace.mission = ps_workspaces.mission; // (pb) workspace.mission = ps_workspaces.mission;
} // (pb) }
} // (pb) }
query RolesForUser { query RolesForUser {
BigDecimal groupID; BigDecimal groupID;

2
ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Workspace.pdl
View File

@ -74,7 +74,7 @@ query childWorkspacesForApplicationID {
workspace.displayName = acs_objects.display_name; workspace.displayName = acs_objects.display_name;
workspace.defaultDomainClass = acs_objects.default_domain_class; workspace.defaultDomainClass = acs_objects.default_domain_class;
workspace.parentResource.id = applications.parent_application_id; workspace.parentResource.id = applications.parent_application_id;
workspace.packageInstance.id = applications.package_id; // workspace.packageInstance.id = applications.package_id; (Old style app code removed)
workspace.title = applications.title; workspace.title = applications.title;
workspace.primaryURL = applications.primary_url; workspace.primaryURL = applications.primary_url;
workspace.description = applications.description; workspace.description = applications.description;