[Rt-commit] rt 01/02: Switch to more abstract method DecodedContent to cover all the cases

[sunnavy]

This is an automated email from the git hooks/post-receive script.

sunnavy pushed a commit to branch 5.0/configuration-json-format
in repository rt.

commit ddfa2216b6ba0a3358a4fb620e523a7b4a8f8779
Author: sunnavy <sunnavy at bestpractical.com>
AuthorDate: Wed Jul 21 06:46:51 2021 +0800

    Switch to more abstract method DecodedContent to cover all the cases
    
    We are going to add JSON format support and DecodedContent will just
    work by then.
---
 share/html/Admin/Lifecycles/Modify.html  | 2 +-
 share/html/Widgets/Form/CustomDateRanges | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/html/Admin/Lifecycles/Modify.html b/share/html/Admin/Lifecycles/Modify.html
index 237b6e2001..67c6422694 100644
--- a/share/html/Admin/Lifecycles/Modify.html
+++ b/share/html/Admin/Lifecycles/Modify.html
@@ -138,7 +138,7 @@ else {
     unless ($Layout) {
         my $conf = RT::Configuration->new( $session{CurrentUser} );
         $conf->LoadByCols( 'Name' => "LifecycleLayout-$Name", Disabled => 0 );
-        $Layout = $conf->Id ? JSON( $conf->_DeserializeContent( $conf->Content ) ) : '';
+        $Layout = $conf->Id ? JSON( $conf->DecodedContent ) : '';
     }
 }
 
diff --git a/share/html/Widgets/Form/CustomDateRanges b/share/html/Widgets/Form/CustomDateRanges
index 200cd34b3e..764cd7effb 100644
--- a/share/html/Widgets/Form/CustomDateRanges
+++ b/share/html/Widgets/Form/CustomDateRanges
@@ -77,7 +77,7 @@ my $db_config = RT::Configuration->new( $session{CurrentUser} );
 $db_config->LoadByCols( Name => 'CustomDateRangesUI', Disabled => 0 );
 
 my $content;
-$content = $db_config->_DeserializeContent( $db_config->Content ) if $db_config->id;
+$content = $db_config->DecodedContent if $db_config->id;
 </%INIT>
 </%METHOD>
 

-- 
To stop receiving notification emails like this one, please contact
sysadmin at bestpractical.com.