From bb938d4482fd78e775941196dd630f11c4edcd29 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Fri, 11 Nov 2016 13:54:35 -0800
Subject: [PATCH] Fix Script test action

---
 plexpy/notification_handler.py | 2 +-
 plexpy/notifiers.py            | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py
index 91bec821..0228f5e9 100644
--- a/plexpy/notification_handler.py
+++ b/plexpy/notification_handler.py
@@ -179,7 +179,7 @@ def notify(notifier_id=None, notify_action=None, stream_data=None, timeline_data
     notifiers.send_notification(notifier_id=notifier_config['id'],
                                 subject=subject,
                                 body=body,
-                                action=notify_action.split('on_')[-1],
+                                notify_action=notify_action,
                                 parameters=parameters)
 
     # Set the notification state in the db
diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py
index d95d2cab..22309d4f 100644
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -506,14 +506,14 @@ def set_notifier_config(notifier_id=None, agent_id=None, **kwargs):
         return False
 
 
-def send_notification(notifier_id=None, subject='', body='', action='', **kwargs):
+def send_notification(notifier_id=None, subject='', body='', notify_action='', **kwargs):
     notifier_config = get_notifier_config(notifier_id=notifier_id)
     if notifier_config:
         agent = get_agent_class(agent_id=notifier_config['agent_id'],
                                 config=notifier_config['config'])
         return agent.notify(subject=subject,
                             body=body,
-                            action=action,
+                            action=notify_action.split('on_')[-1],
                             **kwargs)
     else:
         logger.debug(u"PlexPy Notifiers :: Notification requested but no notifier_id received.")
@@ -2299,7 +2299,6 @@ class SCRIPTS(Notifier):
             return
 
         script_args = subject or None
-        action = kwargs.get('action', '')
 
         logger.debug(u"PlexPy Notifiers :: Trying to run notify script, action: %s, arguments: %s"
                      % (action, script_args))
@@ -2361,14 +2360,14 @@ class SCRIPTS(Notifier):
                          {'label': 'Script Folder',
                           'value': self.config['script_folder'],
                           'name': 'scripts_script_folder',
-                          'description': 'Set your script folder.',
+                          'description': 'Enter the full path to your scripts folder.',
                           'input_type': 'text',
                           'refresh': True
                           },
                          {'label': 'Script File',
                           'value': self.config['script'],
                           'name': 'scripts_script',
-                          'description': 'Choose the script file.',
+                          'description': 'Choose the script file to run.',
                           'input_type': 'select',
                           'select_options': self.list_scripts()
                           },