[Rt-commit] rt branch, 4.4/external-storage, updated. rt-4.2.11-30-g0b02f39

[Shawn Moore]

The branch, 4.4/external-storage has been updated
       via  0b02f39a626797866990c102a18a5ecb65125b39 (commit)
       via  3c63421ab2883c2de7c56fea942d6355bf90002c (commit)
      from  45d865847b163b2526413b60a0bd93cfe551b8c8 (commit)

Summary of changes:
 lib/RT/Config.pm               | 13 +++++++++++++
 lib/RT/ExternalStorage.pm      | 10 ----------
 lib/RT/ExternalStorage/Disk.pm |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

- Log -----------------------------------------------------------------
commit 3c63421ab2883c2de7c56fea942d6355bf90002c
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Thu May 21 23:00:08 2015 +0000

    Fix reference to now-removed %self

diff --git a/lib/RT/ExternalStorage/Disk.pm b/lib/RT/ExternalStorage/Disk.pm
index 11ef078..238d586 100644
--- a/lib/RT/ExternalStorage/Disk.pm
+++ b/lib/RT/ExternalStorage/Disk.pm
@@ -70,7 +70,7 @@ sub Init {
     } elsif (not -e $self->Path) {
         RT->Logger->error("Path provided for local storage (".$self->Path.") does not exist");
         return;
-    } elsif ($self{Write} and not -w $self->Path) {
+    } elsif ($self->{Write} and not -w $self->Path) {
         RT->Logger->error("Path provided for local storage (".$self->Path.") is not writable");
         return;
     }

commit 0b02f39a626797866990c102a18a5ecb65125b39
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Thu May 21 23:01:00 2015 +0000

    Move additional META entry into RT::Config

diff --git a/lib/RT/Config.pm b/lib/RT/Config.pm
index 3a0c16b..01ab952 100644
--- a/lib/RT/Config.pm
+++ b/lib/RT/Config.pm
@@ -985,6 +985,19 @@ our %META;
             $config->Set( CustomFieldGroupings => %$groups );
         },
     },
+    ExternalStorage => {
+        Type            => 'HASH',
+        PostLoadCheck   => sub {
+            my $self = shift;
+            my %hash = $self->Get('ExternalStorage');
+            return unless keys %hash;
+
+            require RT::ExternalStorage;
+
+            $hash{Write} = $RT::ExternalStorage::WRITE;
+            $RT::ExternalStorage::BACKEND = RT::ExternalStorage::Backend->new( %hash );
+        },
+    },
     ChartColors => {
         Type    => 'ARRAY',
     },
diff --git a/lib/RT/ExternalStorage.pm b/lib/RT/ExternalStorage.pm
index 79919f6..41a14a3 100644
--- a/lib/RT/ExternalStorage.pm
+++ b/lib/RT/ExternalStorage.pm
@@ -133,16 +133,6 @@ storage.
 
 our $BACKEND;
 our $WRITE;
-$RT::Config::META{ExternalStorage} = {
-    Type => 'HASH',
-    PostLoadCheck => sub {
-        my $self = shift;
-        my %hash = $self->Get('ExternalStorage');
-        return unless keys %hash;
-        $hash{Write} = $WRITE;
-        $BACKEND = RT::ExternalStorage::Backend->new( %hash );
-    },
-};
 
 sub Store {
     my $class = shift;

-----------------------------------------------------------------------