Index: openacs-4/packages/acs-admin/www/auth/authority.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/authority.tcl,v diff -u -N -r1.27 -r1.28 --- openacs-4/packages/acs-admin/www/auth/authority.tcl 3 Oct 2018 18:43:28 -0000 1.27 +++ openacs-4/packages/acs-admin/www/auth/authority.tcl 3 Oct 2018 19:00:43 -0000 1.28 @@ -31,25 +31,25 @@ {pretty_name:text {html {size 50}} {label "\#acs-admin.Name\#"} - } + } {short_name:text,optional {html {size 50}} {label "\#acs-admin.Short_Name\#"} {mode {[ad_decode $local_authority_p 1 "display" ""]}} {help_text "[_ acs-admin.Authority_short_name_help_text]"} - } + } {enabled_p:text(radio) {label "\#acs-admin.Enabled\#"} {options {{[_ acs-admin.Yes] t} {[_ acs-admin.No] f}}} } {help_contact_text:richtext,optional - {html {cols 60 rows 13}} + {html {cols 60 rows 13}} {label "\#acs-admin.Help_contact_text\#"} {help_text "[_ acs-admin.Help_contact_help_text]"} - } + } {-section "auth" {legendtext \#acs-admin.Authentication\#}} @@ -69,12 +69,12 @@ {html {size 50}} {label "\#acs-admin.Recover_password_URL\#"} {help_text "[_ acs-admin.Recover_password_URL_help_text]"} - } + } {change_pwd_url:text,optional {html {size 50}} {label "\#acs-admin.Change_password_URL\#"} {help_text "[_ acs-admin.Change_password_URL_help_text]"} - } + } {-section "accreg" {legendtext \#acs-admin.Account_Registration\#}} @@ -87,7 +87,7 @@ {html {size 50}} {label "\#acs-admin.Account_registration_URL\#"} {help_text "[_ acs-admin.Account_reg_URL_help_text]"} - } + } {-section "ondemsyn" {legendtext \#acs-admin.On-Demand_Sync\#}} @@ -155,7 +155,7 @@ set batch_sync_enabled_p f } \ -edit_request { - + auth::authority::get -authority_id $authority_id -array element_array set page_title $element_array(pretty_name) @@ -167,11 +167,13 @@ if { !$local_authority_p } { # Set the value of the help_contact_text element - both contents and format attributes set help_contact_text [template::util::richtext::create] - set help_contact_text [template::util::richtext::set_property contents $help_contact_text $element_array(help_contact_text)] + set help_contact_text [template::util::richtext::set_property contents $help_contact_text \ + $element_array(help_contact_text)] if { $element_array(help_contact_text_format) eq "" } { set element_array(help_contact_text_format) "text/enhanced" } - set help_contact_text_format [template::util::richtext::set_property format $help_contact_text $element_array(help_contact_text_format)] + set help_contact_text_format [template::util::richtext::set_property format $help_contact_text \ + $element_array(help_contact_text_format)] } } -new_data { @@ -230,7 +232,7 @@ } end_time_pretty { label "\#acs-admin.End_time\#" - } + } run_time { label "\#acs-admin.Run_time\#" html { align right } @@ -261,13 +263,13 @@ set yes [_ acs-kernel.common_Yes] set no [_ acs-kernel.common_No] - - db_multirow -extend { - job_url + + db_multirow -extend { + job_url start_time_pretty end_time_pretty - interactive_pretty - short_message + interactive_pretty + short_message actions_per_minute run_time run_time_seconds @@ -285,11 +287,11 @@ message from auth_batch_jobs where authority_id = :authority_id - order by start_time_ansi + order by start_time_ansi } { set run_time_seconds [expr {[clock scan $end_time_ansi -format "%Y-%m-%d %H:%M:%S"] - [clock scan $start_time_ansi -format "%Y-%m-%d %H:%M:%S"]}] - + set job_url [export_vars -base batch-job { job_id }] set start_time_pretty [lc_time_fmt $start_time_ansi "%x %X"] @@ -347,7 +349,7 @@ set configure_url [export_vars -base authority-parameters { authority_id }] break } - } + } } # Local variables: