OpenACS

emmar
committed
MAIN:emmar:20100317115132
on 17 Mar 10
Initialize url_name for creating a new page or the call would fail. Added theme to the list of args to pass to page::new (was missing).
openacs-4/.../layout-manager/tcl/install-procs.tcl (+3 -2)
48 48     set element_id [eval $cmd]
49 49
50 50     if {$id ne ""} {
51 51         set ::install::xml::ids($id) $element_id
52 52     }
53 53
54 54     return {}
55 55 }
56 56
57 57 ad_proc -public install::xml::action::layout-page {
58 58     {-pageset_id ""}
59 59     node
60 60 } {
61 61     Create a new page.  Either the caller or the XML node may specify the
62 62     pageset_id.
63 63 } {
64 64
65 65     set id [apm_attribute_value -default "" $node id]
66 66     set pageset_id [apm_attribute_value -default $pageset_id $node pageset-id]
67 67     set name [apm_required_attribute_value $node name]
  68     set url_name [apm_attribute_value -default "" $node url-name]
68 69     set theme [apm_attribute_value -default "" $node theme]
69 70     set page_template [apm_attribute_value -default 2_column $node page-template]
70 71
71 72     set cmd layout::page::new
72       foreach param {pageset_id name url_name page_template} {
  73     foreach param {pageset_id name url_name page_template theme} {
73 74         lappend cmd -$param [set $param]
74 75     }
75 76     set page_id [eval $cmd]
76 77
77 78     if {$id ne ""} {
78 79         set ::install::xml::ids($id) $page_id
79 80     }
80 81
81 82     foreach element [xml_node_get_children_by_name $node layout-element] {
82 83         install::xml::action::layout-element -page_id $page_id $element
83 84     }
84 85     return
85 86 }
86 87
87 88 ad_proc -public install::xml::action::layout-pageset { node } {
88 89     Create a new pageset, bound to a given
89 90 } {
90 91     set id [apm_attribute_value -default "" $node id]
91 92     set package_id [::install::xml::object_id::package $node]
92 93     set owner_id [apm_required_attribute_value $node owner-id]