From 2cd069d0be512bc2831128307dfbb03915753df2 Mon Sep 17 00:00:00 2001
From: Martin Kamerbeek <martin@martintwee.oqapi.nl>
Date: Wed, 13 Oct 2010 16:29:29 +0200
Subject: [PATCH] Add listname property.

---
 lib/WebGUI/AssetAspect/Subscriber.pm | 44 ++++++++++++++++++++++++++++
 sbin/install_newsletter.pl           | 19 +++++++++++-
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/lib/WebGUI/AssetAspect/Subscriber.pm b/lib/WebGUI/AssetAspect/Subscriber.pm
index 9f50beb..1e5d32f 100644
--- a/lib/WebGUI/AssetAspect/Subscriber.pm
+++ b/lib/WebGUI/AssetAspect/Subscriber.pm
@@ -19,6 +19,11 @@ sub definition {
 	my $i18n        = WebGUI::International->new( $session,'AssetAspect_Subscriber' );
 
 	tie my %properties, 'Tie::IxHash', (
+        listName                    => {
+            fieldType       => 'text',
+            label           => $i18n->echo("List name"),
+            tab             => 'subscription',
+        },
         subscriptionGroupId         => {
             fieldType       => 'subscriptionGroup',
             label           => $i18n->get( 'Subscription group' ),
@@ -264,6 +269,45 @@ sub getEmailVars {
     return $var;
 }
 
+#----------------------------------------------------------------------------
+sub getAssetByListName {
+    my $class       = shift;
+    my $session     = shift;
+    my $listName    = shift || return;
+    my $db          = $session->db;
+
+    my $assetId = $db->quickScalar( 'select assetId from assetAspectSubscriber where listName=? limit 1', [
+        $listName
+    ] );
+
+    return unless $assetId;
+
+    my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId );
+
+    return $asset;
+}
+
+#----------------------------------------------------------------------------
+sub processPropertiesFromFormPost {
+    my $self    = shift;
+    my $session = $self->session;
+    my $form    = $session->form;
+
+    my $listName    = $form->get('listName');
+    my $asset       = WebGUI::AssetAspect::Subscriber->getAssetByListName( $session, $listName );
+
+    my $errors      = $self->next::method;
+
+    if ( $asset && $asset->getId ne $self->getId ) {
+        return [
+            @{ $errors || [] },
+            "List name $listName is already taken."
+        ];
+    }
+
+    return $errors;
+}
+
 #----------------------------------------------------------------------------
 sub sendSubscriptionConfirmation {
     my $self    = shift;
diff --git a/sbin/install_newsletter.pl b/sbin/install_newsletter.pl
index 5a75065..90b30c7 100644
--- a/sbin/install_newsletter.pl
+++ b/sbin/install_newsletter.pl
@@ -12,7 +12,7 @@ use strict;
 use Pod::Usage;
 use Getopt::Long;
 use WebGUI::Session;
-use List::MoreUtils qw{ insert_after_string };
+use List::MoreUtils qw{ insert_after_string none };
 
 # Get parameters here, including $help
 GetOptions(
@@ -32,9 +32,26 @@ addTemplateColumnToNewsletterCollection( $session );
 addRecentColumnToNewsletterCollection( $session );
 renamespaceTemplates( $session );
 addSpecialStateTable( $session );
+addListNameColumn( $session );
 
 finish($session);
 
+
+#----------------------------------------------------------------------------
+sub addListNameColumn {
+    my $session = shift;
+    my $db      = $session->db;
+    print "\tAdding list name column for subscribers...";
+
+    my @columns = $db->buildArray( 'desc assetAspectSubscriber' );
+
+    if ( none { $_ eq 'listName' } @columns ) {
+        $db->write( 'alter table assetAspectSubscriber add column listName varchar(255)' );
+    }
+
+    print "Done.\n";
+}
+
 #----------------------------------------------------------------------------
 sub installMailableAspectTable {
     my $session = shift;