@faqs.faq_name@
(
- #faq.edit# |
+ #faq.edit# |
enable
@@ -31,5 +31,6 @@
-#faq.Create_a_new_FAQ#
+#faq.Create_a_new_FAQ#
+
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.4 -r1.5
--- openacs-4/packages/faq/www/admin/index.tcl 17 May 2003 10:35:15 -0000 1.4
+++ openacs-4/packages/faq/www/admin/index.tcl 28 Nov 2003 16:55:15 -0000 1.5
@@ -17,7 +17,7 @@
set package_id [ad_conn package_id]
-ad_require_permission $package_id faq_admin_faq
+permission::require_permission -object_id $package_id -privilege faq_admin_faq
set context {}
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.8 -r1.9
--- openacs-4/packages/faq/www/admin/one-faq.adp 22 May 2003 14:54:51 -0000 1.8
+++ openacs-4/packages/faq/www/admin/one-faq.adp 28 Nov 2003 16:55:15 -0000 1.9
@@ -2,7 +2,7 @@
@context;noquote@
#faq.faq_name_Admin#
-#faq.Title# @faq_name@ (#faq.edit#)
+#faq.Title# @faq_name@ (#faq.edit#)
#faq.lt_no_questions#
@@ -14,16 +14,16 @@
@faq_q_and_as.question@
(
- #faq.edit# |
+ #faq.edit# |
#faq.preview# |
#faq.delete# |
- #faq.insert_after# |
+ #faq.insert_after# |
#faq.swap_with_next#
- #faq.insert_after#
+ #faq.insert_after#
)
@@ -32,7 +32,7 @@
Index: openacs-4/packages/faq/www/admin/one-faq.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-faq.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/faq/www/admin/one-faq.tcl 28 Oct 2002 16:07:28 -0000 1.3
+++ openacs-4/packages/faq/www/admin/one-faq.tcl 28 Nov 2003 16:55:15 -0000 1.4
@@ -18,9 +18,8 @@
set user_id [ad_verify_and_get_user_id]
-ad_require_permission $package_id faq_admin_faq
+permission::require_permission -object_id $package_id -privilege faq_admin_faq
-
db_multirow faq_q_and_as faq_q_and_as_select {
select entry_id, faq_id, question, answer, sort_key
from faq_q_and_as
@@ -35,6 +34,6 @@
db_1row faq_name "select faq_name from faqs where faq_id=:faq_id"
set context [list $faq_name]
-set new_faq_url "q_and_a-new?[export_vars { faq_id }]"
+set new_faq_url "q-and-a-add-edit?[export_vars { faq_id }]"
ad_return_template
Index: openacs-4/packages/faq/www/admin/one-question.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-question.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/faq/www/admin/one-question.tcl 28 Oct 2002 16:07:28 -0000 1.3
+++ openacs-4/packages/faq/www/admin/one-question.tcl 28 Nov 2003 16:55:15 -0000 1.4
@@ -18,9 +18,8 @@
set user_id [ad_verify_and_get_user_id]
-ad_require_permission $package_id faq_admin_faq
+permission::require_permission -object_id $package_id -privilege faq_admin_faq
-
db_1row q_and_a_info "select question, answer, a.faq_id, f.faq_name
from faq_q_and_as a, faqs f
where entry_id = :entry_id
Index: openacs-4/packages/faq/www/admin/q-and-a-add-edit-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q-and-a-add-edit-oracle.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/faq/www/admin/q-and-a-add-edit-oracle.xql 28 Nov 2003 16:55:15 -0000 1.1
@@ -0,0 +1,23 @@
+
+
+
+ oracle8.1.6
+
+
+
+ begin
+ :1 := faq.new_q_and_a (
+ entry_id => :entry_id,
+ context_id => :faq_id,
+ faq_id=> :faq_id,
+ question => :question,
+ answer => :answer,
+ sort_key => :sort_key,
+ creation_user => :user_id,
+ creation_ip => :creation_ip
+ );
+ end;
+
+
+
+
Index: openacs-4/packages/faq/www/admin/q-and-a-add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q-and-a-add-edit-postgresql.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/faq/www/admin/q-and-a-add-edit-postgresql.xql 28 Nov 2003 16:55:15 -0000 1.1
@@ -0,0 +1,23 @@
+
+
+
+ postgresql7.1
+
+
+
+ select faq__new_q_and_a (
+ :entry_id,
+ :faq_id,
+ :question,
+ :answer,
+ :sort_key,
+ 'faq_q_and_a',
+ now(),
+ :user_id,
+ :creation_ip,
+ :faq_id
+ );
+
+
+
+
Index: openacs-4/packages/faq/www/admin/q-and-a-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q-and-a-add-edit.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/faq/www/admin/q-and-a-add-edit.adp 28 Nov 2003 16:55:15 -0000 1.1
@@ -0,0 +1,4 @@
+
+@page_title;noquote@
+@context;noquote@
+
Index: openacs-4/packages/faq/www/admin/q-and-a-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q-and-a-add-edit.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/faq/www/admin/q-and-a-add-edit.tcl 28 Nov 2003 16:55:15 -0000 1.1
@@ -0,0 +1,100 @@
+ad_page_contract {
+
+ Adds or Edit a new Q&A to a FAQ
+ @author Gerardo Morales Cadoret (gmorales@galileo.edu)
+ @creation-date 2003-11-26
+} {
+ faq_id:naturalnum,notnull
+ entry_id:optional
+ {prev_entry_id 0}
+} -properties {
+ context:onevalue
+ title:onevalue
+ question:onevalue
+ question_q:onevalue
+ answer:onevalue
+ answer_q:onevalue
+}
+
+db_1row get_name "select faq_name from faqs where faq_id=:faq_id"
+
+if { ![ad_form_new_p -key entry_id]} {
+ set page_title [_ faq.One_Question]
+ set context [list [list "one-faq?faq_id=$faq_id" "$faq_name"] "One Q&A"]
+ permission::require_permission -object_id [ad_conn package_id] -privilege faq_modify_faq
+} else {
+ set page_title [_ faq.Add_QA_for_faq_name]
+ set context [list [list "one-faq?faq_id=$faq_id" "$faq_name"] [_ faq.Create_new_QA]]
+ permission::require_permission -object_id [ad_conn package_id] -privilege faq_create_faq
+}
+
+
+set question ""
+set answer ""
+set insert_p "f"
+set mime_type ""
+set question_q [ad_quotehtml $question]
+set answer_q [ad_quotehtml $answer]
+set user_id [ad_verify_and_get_user_id]
+set creation_ip [ad_conn host]
+
+ad_form -name new_quest_answ -export {faq_id creation_ip} -form {
+
+ entry_id:key
+ {prev_entry_id:text(hidden) {value $prev_entry_id}}
+ {question:text(textarea) {label "Question"} {html {rows 10 cols 40 wrap soft }}}
+ {answer:text(textarea) {label "Answer"} {html {rows 10 cols 40 wrap soft }} }
+
+} -select_query {
+
+ select question, answer,faq_name,qa.faq_id
+ from faq_q_and_as qa, faqs f
+ where entry_id = :entry_id
+ and f.faq_id = qa.faq_id
+
+} -new_data {
+
+ set page_title [_ faq.Add_QA_for_faq_name]
+ set last_entry_id $prev_entry_id
+
+ db_transaction {
+
+ set old_sort_key [db_string faq_sortkey_get "select sort_key from faq_q_and_as
+ where entry_id = :last_entry_id" -default 0]
+
+ if ![string equal $old_sort_key 0] {
+ set sql_update_q_and_as "
+ update faq_q_and_as
+ set sort_key = sort_key + 1
+ where sort_key > :old_sort_key"
+
+ db_dml faq_update $sql_update_q_and_as
+
+ set sort_key [expr $old_sort_key + 1]
+
+ } else {
+
+ set sort_key $entry_id
+
+ }
+ }
+
+
+ db_transaction {
+ db_exec_plsql create_q_and_a { *SQL* }
+ }
+
+} -edit_data {
+
+db_dml q_and_a_edit "update faq_q_and_as
+ set question = :question,
+ answer = :answer
+ where entry_id = :entry_id"
+} -after_submit {
+ ad_returnredirect "one-faq?faq_id=$faq_id"
+ ad_script_abort
+}
+
+
+
+
Index: openacs-4/packages/faq/www/admin/q_and_a-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/admin/q_and_a-delete.tcl 18 Sep 2002 12:02:20 -0000 1.2
+++ openacs-4/packages/faq/www/admin/q_and_a-delete.tcl 28 Nov 2003 16:55:15 -0000 1.3
@@ -11,8 +11,9 @@
}
# We need to rethink the q-and-a permissioning.
- ad_require_permission [ad_conn package_id] faq_delete_faq
+permission::require_permission -object_id [ad_conn package_id] -privilege faq_delete_faq
+
db_1row get_faq_id "select faq_id from faq_q_and_as where entry_id=:entry_id"
db_transaction {
Index: openacs-4/packages/faq/www/admin/swap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/swap.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/admin/swap.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/faq/www/admin/swap.tcl 28 Nov 2003 16:55:15 -0000 1.2
@@ -16,10 +16,9 @@
set package_id [ad_conn package_id]
-ad_require_permission $package_id faq_modify_faq
+permission::require_permission -object_id $package_id -privilege faq_modify_faq
-
# get the sort_key for this entry_id, faq_id
db_1row faq_sortkey_get "
select sort_key as current_sort_key