Index: openacs-4/packages/chat/lib/transcript-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/transcript-view.adp,v
diff -u -N
--- openacs-4/packages/chat/lib/transcript-view.adp 17 Mar 2020 14:06:38 -0000 1.4.2.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-
-#chat.Edit#
-
-
-
-
- #chat.Transcript_name# |
- @transcript_name@ |
-
-
- #chat.Description# |
- @description@ |
-
-
-
-
Index: openacs-4/packages/chat/lib/transcript-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/transcript-view.tcl,v
diff -u -N
--- openacs-4/packages/chat/lib/transcript-view.tcl 9 Feb 2020 15:30:16 -0000 1.5.6.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-ad_include_contract {
- This include displays and manages specified chat transcript
-} {
- room_id:naturalnum
- transcript_id:naturalnum
-}
-
-db_1row get_transcript {
- select pretty_name as transcript_name,
- description,
- contents,
- room_id
- from chat_transcripts
- where transcript_id=:transcript_id
-}
-
-set edit_p [permission::permission_p -object_id $room_id -privilege "chat_transcript_edit"]
-
-set edit_url [export_vars -base "transcript-edit" {transcript_id room_id}]
-
-# Local variables:
-# mode: tcl
-# tcl-indent-level: 4
-# indent-tabs-mode: nil
-# End:
Index: openacs-4/packages/chat/lib/transcripts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/transcripts.tcl,v
diff -u -N -r1.5.2.2 -r1.5.2.3
--- openacs-4/packages/chat/lib/transcripts.tcl 9 Feb 2020 15:30:16 -0000 1.5.2.2
+++ openacs-4/packages/chat/lib/transcripts.tcl 2 Jun 2021 12:23:31 -0000 1.5.2.3
@@ -21,7 +21,7 @@
order by ao.creation_date desc
} {
set creation_date_pretty [lc_time_fmt $creation_date "%q %X"]
- set transcript_url [export_vars -base "chat-transcript" {room_id transcript_id}]
+ set transcript_url [export_vars -base "transcript-edit" {room_id transcript_id}]
set delete_url [export_vars -base "transcript-delete" {room_id transcript_id}]
}
Index: openacs-4/packages/chat/www/chat-transcript.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat-transcript.adp,v
diff -u -N -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/chat/www/chat-transcript.adp 14 Feb 2019 16:15:01 -0000 1.4.2.1
+++ openacs-4/packages/chat/www/chat-transcript.adp 2 Jun 2021 12:23:31 -0000 1.4.2.2
@@ -2,9 +2,4 @@
@context;literal@
#chat.transcript_of_room# "@room_name;noquote@"
-
-
-
-
-
Index: openacs-4/packages/chat/www/transcript-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-edit-2.tcl,v
diff -u -N
--- openacs-4/packages/chat/www/transcript-edit-2.tcl 2 Mar 2019 17:51:10 -0000 1.10.2.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-#/chat/www/transcript-edit-2.tcl
-ad_page_contract {
- Update chat transcript.
-
- @author David Dao (ddao@arsdigita.com)
- @creation-date November 28, 2000
- @cvs-id $Id: transcript-edit-2.tcl,v 1.10.2.2 2019/03/02 17:51:10 antoniop Exp $
-} {
- transcript_id:notnull,naturalnum
- transcript_name:trim,notnull
- contents:html,notnull
- room_id:notnull,naturalnum
- {description:trim ""}
-}
-
-permission::require_permission -object_id $transcript_id -privilege chat_transcript_edit
-
-if { [catch {
- set t [::xo::db::Class get_instance_from_db -id $transcript_id]
- $t set pretty_name $transcript_name
- $t set description $description
- $t set contents $contents
- $t save
-} errmsg] } {
- ad_return_complaint 1 "[_ chat.Could_not_update_transcript]: $errmsg"
- ad_script_abort
-}
-
-ad_returnredirect "transcript-view?transcript_id=$transcript_id&room_id=$room_id"
-ad_script_abort
-
-# Local variables:
-# mode: tcl
-# tcl-indent-level: 4
-# indent-tabs-mode: nil
-# End:
Index: openacs-4/packages/chat/www/transcript-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-edit.adp,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/chat/www/transcript-edit.adp 17 Jun 2016 17:48:21 -0000 1.3
+++ openacs-4/packages/chat/www/transcript-edit.adp 2 Jun 2021 12:23:31 -0000 1.3.2.1
@@ -1,4 +1,4 @@
-#chat.Edit_transcript# @pretty_name@
+#chat.Edit_transcript#: @pretty_name@
Index: openacs-4/packages/chat/www/transcript-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-edit.tcl,v
diff -u -N -r1.12.2.2 -r1.12.2.3
--- openacs-4/packages/chat/www/transcript-edit.tcl 2 Mar 2019 17:51:10 -0000 1.12.2.2
+++ openacs-4/packages/chat/www/transcript-edit.tcl 2 Jun 2021 12:23:31 -0000 1.12.2.3
@@ -18,11 +18,14 @@
set active_p [$r set active_p]
set t [::xo::db::Class get_instance_from_db -id $transcript_id]
-set pretty_name [$t set pretty_name]
-set description [$t set description]
-set contents [$t set contents]
+set pretty_name [lang::util::localize [$t set pretty_name]]
+set description [lang::util::localize [$t set description]]
+set contents [lang::util::localize [$t set contents]]
-ad_form -name "edit-transcription" -edit_buttons [list [list [_ chat.Edit] next]] -has_edit 1 -form {
+ad_form \
+ -mode display \
+ -name "edit-transcription" \
+ -form {
{room_id:integer(hidden)
{value $room_id}
}
@@ -38,23 +41,32 @@
{html {rows 6 cols 65}}
{value $description}
}
- {contents:text(textarea)
- {label "#chat.Transcript#" }
- {html {rows 6 cols 65}}
- {value $contents}
+}
+
+if { [template::form::get_action "edit-transcription"] eq "" } {
+ ad_form -extend -name "edit-transcription" -form {
+ {contents:text(inform)
+ {label "#chat.Transcript#" }
+ {html {rows 6 cols 65}}
+ {noquote noquote}
+ {value "$contents
"}
+ }
}
-} -on_submit {
- $t set pretty_name $pretty_name
- $t set description $description
- $t set contents $contents
- if { [catch {
+} else {
+ ad_form -extend -name "edit-transcription" -form {
+ {contents:text(textarea)
+ {label "#chat.Transcript#" }
+ {html {rows 6 cols 65}}
+ {value "$contents"}
+ }
+ } -on_submit {
+ $t set pretty_name $pretty_name
+ $t set description $description
+ $t set contents $contents
$t save
- } errmsg] } {
- ad_return_complaint 1 "[_ chat.Could_not_update_transcript]: $errmsg"
- } else {
- ad_returnredirect [export_vars -base "chat-transcript" {transcript_id room_id}]
+ ad_returnredirect [export_vars -base "transcript-edit" {transcript_id room_id}]
+ ad_script_abort
}
- ad_script_abort
}
# Local variables: