Index: openacs-4/packages/faq/lib/faq-add-edit-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/lib/faq-add-edit-oracle.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/faq/lib/faq-add-edit-oracle.xql 22 Dec 2003 23:42:33 -0000 1.1
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<queryset>
+ <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="create_faq">
+ <querytext>
+ begin
+ :1 := faq.new_faq (
+ faq_id => :faq_id,
+ faq_name => :faq_name,
+ separate_p => :separate_p,
+ creation_user => :user_id,
+ creation_ip => :creation_ip,
+ context_id => :package_id
+ );
+ end;
+ </querytext>
+</fullquery>
+
+
+</queryset>
+
Index: openacs-4/packages/faq/lib/faq-add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/lib/faq-add-edit-postgresql.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/faq/lib/faq-add-edit-postgresql.xql 22 Dec 2003 23:42:33 -0000 1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<queryset>
+ <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="create_faq">
+ <querytext>
+ select faq__new_faq (:faq_id, :faq_name,:separate_p,'faq', now(), :user_id,:creation_ip,:package_id);
+ </querytext>
+</fullquery>
+
+
+</queryset>
Index: openacs-4/packages/faq/lib/faq-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/lib/faq-add-edit.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/faq/lib/faq-add-edit.adp 22 Dec 2003 23:42:33 -0000 1.1
@@ -0,0 +1 @@
+<formtemplate id="faq_add_edit"></formtemplate>
Index: openacs-4/packages/faq/lib/faq-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/lib/faq-add-edit.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/faq/lib/faq-add-edit.tcl 22 Dec 2003 23:42:33 -0000 1.1
@@ -0,0 +1,31 @@
+if { ![exists_and_not_null mode] } {
+ set mode "edit"
+}
+
+ad_form -name faq_add_edit -mode $mode -action "[ad_conn package_url]admin/faq-add-edit" -form {
+
+ faq_id:key
+ {faq_name:text(text) {label "FAQ Name"} {html { size 50 }}}
+ {separate_p:text(select) {label "Each Q&A on separate page"} { options {{No f} {Yes t}} } }
+
+ } -select_query {
+ select faq_name,separate_p from faqs where faq_id = :faq_id
+ } -new_data {
+ set user_id [ad_conn user_id]
+ set creation_ip [ad_conn host]
+ set package_id [ad_conn package_id]
+ set faq_id [db_exec_plsql create_faq {}]
+ } -edit_data {
+ db_dml faq_edit {
+ update faqs
+ set faq_name = :faq_name,
+ separate_p = :separate_p
+ where faq_id = :faq_id
+ }
+ } -after_submit {
+ if { ![exists_and_not_null return_url] } {
+ set return_url [export_vars -base one-faq { faq_id }]
+ }
+ ad_returnredirect $return_url
+ ad_script_abort
+ }
Index: openacs-4/packages/faq/www/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/faq/www/one-faq.adp 22 May 2003 14:54:15 -0000 1.7
+++ openacs-4/packages/faq/www/one-faq.adp 22 Dec 2003 23:42:33 -0000 1.8
@@ -10,20 +10,20 @@
<ol>
<multiple name="one_question">
-<if @separate_p@ eq "t">
+<if @separate_p@ true>
<li>
<a href="one-question?entry_id=@one_question.entry_id@">@one_question.question@</a>
</li>
</if>
-<if @separate_p@ eq "f">
+<if @separate_p@ false>
<li>
<a href="#@one_question.entry_id@">@one_question.question@</a>
</li>
</if>
</multiple>
</ol>
-<if @separate_p@ eq "f">
+<if @separate_p@ false>
<hr>
<ol>
<multiple name="one_question">
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/faq/www/admin/faq-add-edit-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/faq/www/admin/faq-add-edit-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/faq/www/admin/faq-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-add-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/admin/faq-add-edit.adp 22 Dec 2003 23:24:41 -0000 1.2
+++ openacs-4/packages/faq/www/admin/faq-add-edit.adp 22 Dec 2003 23:42:33 -0000 1.3
@@ -3,4 +3,4 @@
<property name="context">@context;noquote@</property>
<property name="focus">faq_add_edit.faq_name</property>
-<formtemplate id="faq_add_edit"></formtemplate>
+<include src="/packages/faq/lib/faq-add-edit" &="faq_id" &="return_url">
Index: openacs-4/packages/faq/www/admin/faq-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-add-edit.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/faq/www/admin/faq-add-edit.tcl 22 Dec 2003 23:24:41 -0000 1.3
+++ openacs-4/packages/faq/www/admin/faq-add-edit.tcl 22 Dec 2003 23:42:33 -0000 1.4
@@ -19,9 +19,6 @@
set context {[_ faq.Create_an_FAQ]}
set submit_label [_ faq.Create_FAQ]
set faq_name ""
-set package_id [ad_conn package_id]
-set user_id [ad_verify_and_get_user_id]
-set creation_ip [ad_conn host]
if { ![ad_form_new_p -key faq_id]} {
set context {[_ faq.Edit_an_FAQ]}
@@ -33,28 +30,3 @@
permission::require_permission -object_id [ad_conn package_id] -privilege faq_create_faq
}
-ad_form -name faq_add_edit -form {
-
- faq_id:key
- {faq_name:text(text) {label "FAQ Name"} {html { size 50 }}}
- {separate_p:text(select) {label "Category"} { options {{No f} {Yes t}} } }
-
- } -select_query {
- select faq_name,separate_p from faqs where faq_id = :faq_id
- } -new_data {
- set faq_id [db_exec_plsql create_faq {}]
- } -edit_data {
- db_dml faq_edit {
- update faqs
- set faq_name = :faq_name,
- separate_p = :separate_p
- where faq_id = :faq_id
- }
- } -after_submit {
- if { ![exists_and_not_null return_url] } {
- set return_url [export_vars -base one-faq { faq_id }]
- }
- ad_returnredirect $return_url
- ad_script_abort
- }
-
Index: openacs-4/packages/faq/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/index.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/faq/www/admin/index.tcl 22 Dec 2003 23:24:41 -0000 1.6
+++ openacs-4/packages/faq/www/admin/index.tcl 22 Dec 2003 23:42:33 -0000 1.7
@@ -69,7 +69,7 @@
from acs_objects o, faqs f
where object_id = faq_id
and context_id = :package_id
- order by disabled_p, faq_name
+ order by lower(faq_name), faq_name
} {
set edit_url [export_vars -base faq-add-edit { faq_id }]
set manage_url [export_vars -base one-faq { faq_id }]
Index: openacs-4/packages/faq/www/admin/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-faq.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/faq/www/admin/one-faq.adp 22 Dec 2003 23:24:41 -0000 1.10
+++ openacs-4/packages/faq/www/admin/one-faq.adp 22 Dec 2003 23:42:33 -0000 1.11
@@ -2,8 +2,8 @@
<property name="context">@context;noquote@</property>
<property name="title">#faq.faq_name_Admin#</property>
-<b>#faq.Title#</b> @faq_name@ (<a href=faq-add-edit?faq_id=@faq_id@>#faq.edit#</a>)
-<p>
+<include src="/packages/faq/lib/faq-add-edit" &="faq_id" mode="display">
+
<if @faq_q_and_as:rowcount@ eq 0>
<i>#faq.lt_no_questions#</i><p>
</if>