Index: openacs-4/packages/new-portal/new-portal.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/new-portal.info,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/new-portal/new-portal.info 22 Jan 2002 22:27:51 -0000 1.14
+++ openacs-4/packages/new-portal/new-portal.info 31 May 2002 06:36:47 -0000 1.15
@@ -34,17 +34,34 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -65,19 +82,26 @@
-
-
+
+
+
+
+
+
+
+
+
@@ -92,6 +116,7 @@
+
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.144 -r1.145
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl 29 May 2002 23:00:26 -0000 1.144
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl 31 May 2002 06:36:47 -0000 1.145
@@ -1458,7 +1458,12 @@
}
- ad_proc -public configure_element { element_id op return_url } {
+ ad_proc -public configure_element {
+ {-noconn ""}
+ element_id
+ op
+ return_url
+ } {
Dispatch on the element_id and op requested
@param element_id
@@ -1468,8 +1473,10 @@
if { [db_0or1row select {}] } {
# passed in element_id is good, do they have perms?
- ad_require_permission $portal_id portal_read_portal
- ad_require_permission $portal_id portal_edit_portal
+ if {[empty_string_p $noconn]} {
+ ad_require_permission $portal_id portal_read_portal
+ ad_require_permission $portal_id portal_edit_portal
+ }
} else {
ad_returnredirect $return_url
}
@@ -1525,7 +1532,10 @@
}
"hide" {
db_dml hide_update {}
- ad_returnredirect $return_url
+
+ if {![empty_string_p $return_url]} {
+ ad_returnredirect $return_url
+ }
}
}
}
@@ -1636,6 +1646,16 @@
return [db_list select {}]
}
+ ad_proc -private get_element_id_by_pretty_name {
+ {-portal_id:required}
+ {-pretty_name:required}
+ } {
+ Get the element IDs with the given pn on the portal, returns
+ the empty string if none is found
+ } {
+ return [db_string select {} -default ""]
+ }
+
ad_proc -private get_layout_region_count {
{-layout_id:required}
} {
Index: openacs-4/packages/new-portal/tcl/portal-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.xql,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/new-portal/tcl/portal-procs.xql 24 May 2002 01:58:46 -0000 1.29
+++ openacs-4/packages/new-portal/tcl/portal-procs.xql 31 May 2002 06:36:47 -0000 1.30
@@ -658,6 +658,16 @@
+
+
+ select element_id
+ from portal_element_map pem, portal_pages pp
+ where pp.portal_id= :portal_id
+ and pem.page_id = pp.page_id
+ and pem.pretty_name = :pretty_name
+
+
+
select count(*) as region_count
Index: openacs-4/packages/new-portal/www/place-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element.tcl,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/new-portal/www/place-element.tcl 8 May 2002 14:37:00 -0000 1.32
+++ openacs-4/packages/new-portal/www/place-element.tcl 31 May 2002 06:36:47 -0000 1.33
@@ -62,7 +62,7 @@
db_foreach hidden_elements {} {
set show_avail_p 1
- append show_html "\n"
+ append show_html "\n"
}
set imgdir "[portal::mount_point]/place-element-components"
Index: openacs-4/packages/new-portal/www/place-element.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/new-portal/www/place-element.xql 2 Apr 2002 22:43:12 -0000 1.4
+++ openacs-4/packages/new-portal/www/place-element.xql 31 May 2002 06:36:47 -0000 1.5
@@ -17,7 +17,7 @@
-select element_id, name
+select element_id, pem.pretty_name
from portal_element_map pem, portal_pages pp
where
pp.portal_id = :portal_id