JavaScript error fix when config-lock env var set (#182)

apprise_api/api/forms.py

@@ -152,8 +152,9 @@ class NotifyForm(forms.Form):
         required=False,
     )
 
-    # Allow support for tags keyword in addition to tag; the 'tag' field will always take priority over this
+    # Allow support for tags keyword in addition to tag; the 'tag' field will
-    # however adding `tags` gives the user more flexibilty to use either/or keyword
+    # always take priority over this however adding `tags` gives the user more
+    # flexibilty to use either/or keyword
     tags = forms.CharField(
         label=_('Tags'),
         widget=forms.HiddenInput(),

apprise_api/api/templates/base.html

@@ -50,8 +50,10 @@
         <ul class="collection z-depth-1">
           <a class="collection-item" href="{% url 'config' DEFAULT_CONFIG_ID %}"><i class="material-icons">settings</i>
             {% trans "Configuration Manager" %}</a>
+					{% if not CONFIG_LOCK %}
           <a class="collection-item" href="{% url 'config' UNIQUE_CONFIG_ID %}"><i class="material-icons">refresh</i>
             {% trans "New Configuration" %}</a>
+					{% endif %}
         </ul>
 {% endif %}
         <ul class="collection z-depth-1">

apprise_api/api/templates/config.html

@@ -12,7 +12,7 @@
       </li>
       <li class="tab {% if CONFIG_LOCK %}disabled {% endif %}col s3"><a href="#review"><i class="material-icons">{% if not CONFIG_LOCK %}web{% else %}lock{% endif %}</i> {%trans "Review" %}</a>
       </li>
-      <li class="tab col s3"><a href="#notify"><i class="material-icons">announcement</i> {%trans "Notifications" %} <span class="card-count"></span></a>
+      <li class="tab col s3"><a href="#notify"><i class="material-icons">announcement</i> {%trans "Notifications" %}{% if not CONFIG_LOCK %} <span class="card-count"></span>{% endif %}</a>
       </li>
     </ul>
   </div>
@@ -60,68 +60,68 @@
       </ol>
     </div>
     {% else %}
-      <div class="section">
+    <div class="section">
-        <h5>{% trans "Apprise Configuration is Locked" %}</h5>
+      <h5>{% trans "Apprise Configuration is Locked" %}</h5>
-        <p>
+      <p>
-        {% blocktrans %}At this time, the administrator of this server has locked down all configuration. This means
+      {% blocktrans %}At this time, the administrator of this server has locked down all configuration. This means
-        That pre-created configuration is securely hidden for the purpose of notification transmission only.
+      That pre-created configuration is securely hidden for the purpose of notification transmission only.
 
-        New configuration can not be set, and existing configuration can not be modified or viewed.
+      New configuration can not be set, and existing configuration can not be modified or viewed.
-        {% endblocktrans %}</p>
+      {% endblocktrans %}</p>
-      </div>
-    {% endif %}
-    <div class="has-config">
-      <div class="section">
-        <h5>{% trans "Working Remotely With Your Configuration" %}</h5>
-        <h6>{% trans "Using The Apprise CLI" %}</h6>
-        <p>
-        {% blocktrans %}The following command would cause apprise to directly notify all of your services:{% endblocktrans %}
-        <pre><code class="bash">apprise --body="Test Message" \<br/>
-        &nbsp;&nbsp;&nbsp;&nbsp;apprise{% if request.is_secure %}s{% endif %}://{{request.META.HTTP_HOST}}{{BASE_URL}}/<em>{{key}}</em>/?tags=all</code></pre>
-        {% blocktrans %}Send one or more attachments like this:{% endblocktrans %}
-        <pre><code class="bash">apprise --body="Test Message" \<br/>
-        &nbsp;&nbsp;&nbsp;&nbsp;apprise{% if request.is_secure %}s{% endif %}://{{request.META.HTTP_HOST}}{{BASE_URL}}/<em>{{key}}</em>/?tags=all \<br/>
-        &nbsp;&nbsp;&nbsp;&nbsp;--attach=/path/to/an/attachment.jpeg \ <br/>
-        &nbsp;&nbsp;&nbsp;&nbsp;--attach=https://raw.githubusercontent.com/caronc/apprise/master/apprise/assets/themes/default/apprise-logo.png<br/>
-        </code></pre>
-        </p>
-        {% if not CONFIG_LOCK %}
-        <p>
-        {% blocktrans %}The following command would cause apprise to retrieve the configuration loaded and
-        send a test notification to all of your added services:{% endblocktrans %}
-        <br />
-        <pre><code class="bash">apprise --body="Test Message" --tag=all \<br/>
-        &nbsp;&nbsp;&nbsp;&nbsp;--config={{request.scheme}}://{{request.META.HTTP_HOST}}{{BASE_URL}}/get/<em>{{key}}</em></code></pre>
-        {% blocktrans %}You may also create an <a href="https://github.com/caronc/apprise/wiki/config#cli" target="_blank">Apprise configuration file</a> that contains this line somewhere in it:{% endblocktrans %}
-        <pre><code class="bash">include {{request.scheme}}://{{request.META.HTTP_HOST}}{{BASE_URL}}/get/<em>{{key}}</em></code></pre>
-        {% blocktrans %}By leveraging the <em>include</em> directive, it will automatically be referenced for future calls to the <code>apprise</code> tool. All future calls using Apprise now simplify to:{% endblocktrans %}
-        <pre><code class="bash">apprise --body="Test Message" --tag=all</em></code></pre>
-        </p>
-
-        {% endif %}
-        <h6>{% trans "Using CURL" %}</h6>
-        <p>
-        {% blocktrans %}The following command would cause the apprise api to notify all of your services:{% endblocktrans %}
-        <pre><code class="bash">curl&nbsp;-X&nbsp;POST \<br/>
-            &nbsp;&nbsp;&nbsp;&nbsp;-F "body=Test Message" \<br/>
-            &nbsp;&nbsp;&nbsp;&nbsp;-F "tags=all" \<br/>
-            &nbsp;&nbsp;&nbsp;&nbsp;http{% if request.is_secure %}s{% endif %}://{{request.META.HTTP_HOST}}{{BASE_URL}}/notify/<em>{{key}}</em></code></pre>
-        {% blocktrans %}Send one or more attachments like this:{% endblocktrans %}
-        <pre><code class="bash">curl&nbsp;-X&nbsp;POST \<br/>
-            &nbsp;&nbsp;&nbsp;&nbsp;-F "tags=all" \<br/>
-            &nbsp;&nbsp;&nbsp;&nbsp;-F "body=Test Message" \<br/>
-            &nbsp;&nbsp;&nbsp;&nbsp;-F attach1=@Screenshot-1.png \<br/>
-            &nbsp;&nbsp;&nbsp;&nbsp;-F attach2=@/my/path/to/Apprise.doc \<br/>
-            &nbsp;&nbsp;&nbsp;&nbsp;http{% if request.is_secure %}s{% endif %}://{{request.META.HTTP_HOST}}{{BASE_URL}}/notify/<em>{{key}}</em></code></pre>
-        {% blocktrans %}Sends a notification to our endpoints with an attachment{% endblocktrans %}
-         <pre><code class="bash">
-        curl -X POST \<br/>
-        &nbsp;&nbsp;&nbsp;&nbsp;-F "tag=all" \ <br/>
-        &nbsp;&nbsp;&nbsp;&nbsp;-F "attach=https://raw.githubusercontent.com/caronc/apprise/master/apprise/assets/themes/default/apprise-logo.png" \ <br/>
-        &nbsp;&nbsp;&nbsp;&nbsp;"{{request.scheme}}://{{request.META.HTTP_HOST}}{{BASE_URL}}/notify/<em>{{key}}</em>"</code></pre>
-        </p>
-      </div>
     </div>
+    {% endif %}
+		{% if not CONFIG_LOCK %}
+    <div class="section has-config">
+      <h5>{% trans "Working Remotely With Your Configuration" %}</h5>
+      <h6>{% trans "Using The Apprise CLI" %}</h6>
+      <p>
+      {% blocktrans %}The following command would cause apprise to directly notify all of your services:{% endblocktrans %}
+      <pre><code class="bash">apprise --body="Test Message" \<br/>
+      &nbsp;&nbsp;&nbsp;&nbsp;apprise{% if request.is_secure %}s{% endif %}://{{request.META.HTTP_HOST}}{{BASE_URL}}/<em>{{key}}</em>/?tags=all</code></pre>
+      {% blocktrans %}Send one or more attachments like this:{% endblocktrans %}
+      <pre><code class="bash">apprise --body="Test Message" \<br/>
+      &nbsp;&nbsp;&nbsp;&nbsp;apprise{% if request.is_secure %}s{% endif %}://{{request.META.HTTP_HOST}}{{BASE_URL}}/<em>{{key}}</em>/?tags=all \<br/>
+      &nbsp;&nbsp;&nbsp;&nbsp;--attach=/path/to/an/attachment.jpeg \ <br/>
+      &nbsp;&nbsp;&nbsp;&nbsp;--attach=https://raw.githubusercontent.com/caronc/apprise/master/apprise/assets/themes/default/apprise-logo.png<br/>
+      </code></pre>
+      </p>
+      {% if not CONFIG_LOCK %}
+      <p>
+      {% blocktrans %}The following command would cause apprise to retrieve the configuration loaded and
+      send a test notification to all of your added services:{% endblocktrans %}
+      <br />
+      <pre><code class="bash">apprise --body="Test Message" --tag=all \<br/>
+      &nbsp;&nbsp;&nbsp;&nbsp;--config={{request.scheme}}://{{request.META.HTTP_HOST}}{{BASE_URL}}/get/<em>{{key}}</em></code></pre>
+      {% blocktrans %}You may also create an <a href="https://github.com/caronc/apprise/wiki/config#cli" target="_blank">Apprise configuration file</a> that contains this line somewhere in it:{% endblocktrans %}
+      <pre><code class="bash">include {{request.scheme}}://{{request.META.HTTP_HOST}}{{BASE_URL}}/get/<em>{{key}}</em></code></pre>
+      {% blocktrans %}By leveraging the <em>include</em> directive, it will automatically be referenced for future calls to the <code>apprise</code> tool. All future calls using Apprise now simplify to:{% endblocktrans %}
+      <pre><code class="bash">apprise --body="Test Message" --tag=all</em></code></pre>
+      </p>
+
+      {% endif %}
+      <h6>{% trans "Using CURL" %}</h6>
+      <p>
+      {% blocktrans %}The following command would cause the apprise api to notify all of your services:{% endblocktrans %}
+      <pre><code class="bash">curl&nbsp;-X&nbsp;POST \<br/>
+          &nbsp;&nbsp;&nbsp;&nbsp;-F "body=Test Message" \<br/>
+          &nbsp;&nbsp;&nbsp;&nbsp;-F "tags=all" \<br/>
+          &nbsp;&nbsp;&nbsp;&nbsp;http{% if request.is_secure %}s{% endif %}://{{request.META.HTTP_HOST}}{{BASE_URL}}/notify/<em>{{key}}</em></code></pre>
+      {% blocktrans %}Send one or more attachments like this:{% endblocktrans %}
+      <pre><code class="bash">curl&nbsp;-X&nbsp;POST \<br/>
+          &nbsp;&nbsp;&nbsp;&nbsp;-F "tags=all" \<br/>
+          &nbsp;&nbsp;&nbsp;&nbsp;-F "body=Test Message" \<br/>
+          &nbsp;&nbsp;&nbsp;&nbsp;-F attach1=@Screenshot-1.png \<br/>
+          &nbsp;&nbsp;&nbsp;&nbsp;-F attach2=@/my/path/to/Apprise.doc \<br/>
+          &nbsp;&nbsp;&nbsp;&nbsp;http{% if request.is_secure %}s{% endif %}://{{request.META.HTTP_HOST}}{{BASE_URL}}/notify/<em>{{key}}</em></code></pre>
+      {% blocktrans %}Sends a notification to our endpoints with an attachment{% endblocktrans %}
+       <pre><code class="bash">
+      curl -X POST \<br/>
+      &nbsp;&nbsp;&nbsp;&nbsp;-F "tag=all" \ <br/>
+      &nbsp;&nbsp;&nbsp;&nbsp;-F "attach=https://raw.githubusercontent.com/caronc/apprise/master/apprise/assets/themes/default/apprise-logo.png" \ <br/>
+      &nbsp;&nbsp;&nbsp;&nbsp;"{{request.scheme}}://{{request.META.HTTP_HOST}}{{BASE_URL}}/notify/<em>{{key}}</em>"</code></pre>
+      </p>
+    </div>
+    {% endif %}
   </div>
   <div id="config" class="col s12">
     {% if not CONFIG_LOCK %}
@@ -328,6 +328,7 @@ async function main_init(){
    const data = {
       urls: []
    };
+  const chipElement = document.querySelector('.chips');
   M.Chips.init(chipElement, {
     placeholder: '{% trans "Optional Tag" %}',
     secondaryPlaceholder: '{% trans "Another Tag" %}'

apprise_api/api/tests/test_notify.py

@@ -1014,7 +1014,6 @@ class NotifyTests(SimpleTestCase):
         assert response.status_code == 200
         assert mock_notify.call_count == 1
 
-
         # Reset our mock object
         mock_notify.reset_mock()
 

apprise_api/core/middleware/config.py

@@ -25,7 +25,6 @@
 #
 import re
 from django.conf import settings
-from core.themes import SiteTheme, SITE_THEMES
 import datetime