Feature/fix notify list

CHANGELOG.md

@@ -5,6 +5,9 @@
 #### Improvements
 
 #### Fixes
+- Fix notify lists for prowl and email ([8535](https://github.com/pymedusa/Medusa/pull/8535))
+- Fix shows sorting by article sort using (the, a, an) was reversed in config-general ([8532](https://github.com/pymedusa/Medusa/pull/8532))
+- Fix sending torrents to qBittorrent api version > 2.0.0 ([8528](https://github.com/pymedusa/Medusa/pull/8528))
 
 -----
 

medusa/server/web/home/handler.py

@@ -515,23 +515,25 @@ def loadShowNotifyLists():
 
     @staticmethod
     def saveShowNotifyList(show=None, emails=None, prowlAPIs=None):
-        entries = {'emails': '', 'prowlAPIs': ''}
-
         series_identifier = SeriesIdentifier.from_slug(show)
         series_obj = Series.find_by_identifier(series_identifier)
 
-        if series_obj:
-            if series_obj.notify_list:
-                entries = series_obj.notify_list
+        # Create a new dict, to force the "dirty" flag on the Series object.
+        entries = {'emails': '', 'prowlAPIs': ''}
+
+        if not series_obj:
+            return 'show missing'
+
+        if series_obj.notify_list:
+            entries.update(series_obj.notify_list)
 
         if emails is not None:
             entries['emails'] = emails
-            series_obj.notify_list = entries
 
         if prowlAPIs is not None:
             entries['prowlAPIs'] = prowlAPIs
-            series_obj.notify_list = entries
 
+        series_obj.notify_list = entries
         series_obj.save_to_db()
 
         return 'OK'

medusa/tv/series.py

@@ -7,6 +7,7 @@
 import copy
 import datetime
 import glob
+import json
 import logging
 import os.path
 import shutil
@@ -2026,6 +2027,7 @@ def save_to_db(self):
                           'scene': self.scene,
                           'sports': self.sports,
                           'subtitles': self.subtitles,
+                          'notify_list': json.dumps(self.notify_list),
                           'dvdorder': self.dvd_order,
                           'startyear': self.start_year,
                           'lang': self.lang,

themes-default/slim/src/components/helpers/select-list.vue

@@ -5,9 +5,9 @@
         <ul v-if="!csvMode">
             <li v-for="item of editItems" :key="item.id">
                 <div class="input-group">
-                    <input class="form-control input-sm" type="text" v-model="item.value" @input="removeEmpty(item)">
+                    <input disabled class="form-control input-sm" type="text" v-model="item.value" @input="removeEmpty(item)">
                     <div class="input-group-btn" @click="deleteItem(item)">
-                        <div style="font-size: 14px" class="btn btn-default input-sm">
+                        <div style="font-size: 14px; background-color: rgb(238, 238, 238);" class="btn btn-default input-sm">
                             <i class="glyphicon glyphicon-remove" title="Remove" />
                         </div>
                     </div>

themes-default/slim/src/components/helpers/show-selector.vue

@@ -1,5 +1,5 @@
 <template>
-    <div v-if="showForRoutes" class="show-selector form-inline hidden-print">
+    <div class="show-selector form-inline hidden-print">
         <div class="select-show-group pull-left top-5 bottom-5">
             <select v-if="shows.length === 0" :class="selectClass" disabled>
                 <option>Loading...</option>
@@ -76,10 +76,6 @@ export default {
             });
 
             return sortedShows;
-        },
-        showForRoutes() {
-            const { $route } = this;
-            return ['show', 'editShow'].includes($route.name);
         }
     },
     watch: {

themes-default/slim/src/components/sub-menu.vue

@@ -12,7 +12,7 @@
                     <span :class="['pull-left', menuItem.icon]" /> {{ menuItem.title }}
                 </app-link>
 
-                <show-selector :show-slug="curShowSlug" follow-selection />
+                <show-selector v-if="showForRoutes" :show-slug="curShowSlug" follow-selection />
             </div>
         </div>
 
@@ -47,6 +47,10 @@ export default {
                 return indexername + seriesid;
             }
             return '';
+        },
+        showForRoutes() {
+            const { $route } = this;
+            return ['show', 'editShow'].includes($route.name);
         }
     },
     methods: {

themes-default/slim/test/specs/__snapshots__/select-list.spec.js.snap

@@ -60,6 +60,7 @@ exports[`SelectList.test.js renders with values 1`] = `
       >
         <input
           class="form-control input-sm"
+          disabled="disabled"
           type="text"
         />
 
@@ -68,7 +69,7 @@ exports[`SelectList.test.js renders with values 1`] = `
         >
           <div
             class="btn btn-default input-sm"
-            style="font-size: 14px;"
+            style="font-size: 14px; background-color: rgb(238, 238, 238);"
           >
             <i
               class="glyphicon glyphicon-remove"
@@ -84,6 +85,7 @@ exports[`SelectList.test.js renders with values 1`] = `
       >
         <input
           class="form-control input-sm"
+          disabled="disabled"
           type="text"
         />
 
@@ -92,7 +94,7 @@ exports[`SelectList.test.js renders with values 1`] = `
         >
           <div
             class="btn btn-default input-sm"
-            style="font-size: 14px;"
+            style="font-size: 14px; background-color: rgb(238, 238, 238);"
           >
             <i
               class="glyphicon glyphicon-remove"
@@ -108,6 +110,7 @@ exports[`SelectList.test.js renders with values 1`] = `
       >
         <input
           class="form-control input-sm"
+          disabled="disabled"
           type="text"
         />
 
@@ -116,7 +119,7 @@ exports[`SelectList.test.js renders with values 1`] = `
         >
           <div
             class="btn btn-default input-sm"
-            style="font-size: 14px;"
+            style="font-size: 14px; background-color: rgb(238, 238, 238);"
           >
             <i
               class="glyphicon glyphicon-remove"

themes-default/slim/test/specs/__snapshots__/sub-menu.spec.js.snap

@@ -25,11 +25,7 @@ exports[`SubMenu.test.js renders function-based sub menu 1`] = `
 
       </app-link-stub>
 
-      <show-selector-stub
-        followselection="true"
-        selectclass="select-show form-control input-sm-custom"
-        showslug=""
-      />
+      <!---->
     </div>
   </div>
 
@@ -75,11 +71,7 @@ exports[`SubMenu.test.js renders simple sub menu 1`] = `
 
       </app-link-stub>
 
-      <show-selector-stub
-        followselection="true"
-        selectclass="select-show form-control input-sm-custom"
-        showslug=""
-      />
+      <!---->
     </div>
   </div>