FIX: When Adding a Story Arc via the Search method, if an issue had no title it would error out and only display a few issues when viewing the arc, IMP: When viewing a specific Story Arc, if it was an imported cbl, the issue's would not display the Publication Year properly, IMP: Removed a spammed print message, IMP: Changed the colour of the Donate button so that it's blue.

data/interfaces/default/readlist.html

@@ -79,13 +79,20 @@
                                 <td id="comicname" title="${item['IssueName']}">${item['ComicName']} (${item['SeriesYear']})</td>
                                 <td id="issue">${item['IssueNumber']}</td>
                                 <% 
-                                    if item['IssueDate'] != '0000-00-00':
-                                        issueyear = item['IssueDate'][:4]
-                                    else:
-                                        if item['StoreDate'] != '0000-00-00':
+                                    try:
+                                        if item['IssueDate'] != '0000-00-00' and item['IssueDate'] is not None:
                                             issueyear = item['IssueDate'][:4]
                                         else:
-                                            issueyear = '0000'
+                                            if item['StoreDate'] != '0000-00-00' and item['StoreDate'] is not None:
+                                                issueyear = item['IssueDate'][:4]
+                                            else:
+                                                # this is needed for imported cbl's
+                                                try:
+                                                    issueyear = item['issueYEAR']
+                                                except:
+                                                    issueyear = '0000'
+                                    except:
+                                        issueyear = '0000'
                                  %>
                                 <td id="issueyear">${issueyear}</td>
                                 <td id="status">${item['Status']}</td>

mylar/search.py

@@ -1223,7 +1223,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, Publisher, IssueDa
 #
 #                        else:
 #                            pass
-                            print str(vals)
+                            #print str(vals)
 
                             if vals is not None:
                                 if vals[0]['status'] == 'continue':

mylar/webserve.py

@@ -481,6 +481,11 @@ class WebInterface(object):
                 seriesYear = 'None'
                 issuePublisher = 'None'
 
+                if AD['IssueName'] is None:
+                    IssueName = 'None'
+                else:
+                    IssueName = AD['IssueName'][:70]
+
                 for cid in comicid_results:
                     if cid['ComicID'] == AD['ComicID']:
                         seriesYear = cid['SeriesYear']
@@ -493,7 +498,7 @@ class WebInterface(object):
                            "IssueID":        AD['IssueID'],
                            "StoryArc":       storyarcname,
                            "ComicName":      AD['ComicName'],
-                           "IssueName":      AD['IssueName'][:70],
+                           "IssueName":      IssueName,
                            "IssueNumber":    AD['Issue_Number'],
                            "Publisher":      storyarcpublisher,
                            "TotalIssues":    storyarcissues,