Fix up Headings

Headings are part of the item object and need some special
handling with the recent changes for multipart. This puts
them back in sync.

Signed-off-by: Art Rhyno <art632000@yahoo.ca>

diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py
index db818b2..0138c07 100644 (file)
--- a/conifer/syrup/models.py
+++ b/conifer/syrup/models.py
@@ -417,6 +417,8 @@ class Site(BaseModel):
             dup_ids = []
             push_thru = True
 
+            if item.item_type == 'HEADING':
+                return push_thru, dup_barcodes, dup_ids
             if not BIB_PART_MERGE or edit_status:
                 return push_thru, dup_barcodes, dup_ids
             if not is_dup_candidate(item):

diff --git a/conifer/templates/components/site.xhtml b/conifer/templates/components/site.xhtml
index 14ca98e..75f72ac 100644 (file)
--- a/conifer/templates/components/site.xhtml
+++ b/conifer/templates/components/site.xhtml
@@ -103,6 +103,9 @@ searchtext = _('search this site...')
       <div class="availability avail_nonphys" py:if="item.item_type != 'PHYS'">
       </div>
       <div class="mainline ${item.item_type=='HEADING' and 'headingmainline' or ''}">
+        <a py:if="item.item_type=='HEADING'" href="${item.item_url()}" class="mainlink"
+             py:strip="item.item_type=='ELEC' and not downloads_allowed">${item}
+        </a>
         <?python
             site_url = item.item_url()
             #get base of url without item number
@@ -139,6 +142,11 @@ searchtext = _('search this site...')
         </span>
       </div>
       </span>
+      <div class="mainline ${item.item_type=='HEADING' and 'headingmainline' or ''}">
+        <a py:if="item.item_type=='HEADING'" href="${item.item_url()}" class="mainlink"
+             py:strip="item.item_type=='ELEC' and not downloads_allowed">${item}
+        </a>
+      </div>
       <div class="author_pub" py:if="item.author or item.publisher or item.published or (edit and user.is_staff)">
        <span py:with="vt=item.video_type()"><span class="videotype" py:if="vt">[${vt}]</span></span>
        <span py:if="item.author">${item.author}<span py:if="item.author[-1]!='.'">.</span></span>
@@ -147,7 +155,7 @@ searchtext = _('search this site...')
        <span py:if="item.volume or item.issue"><i>${item.volume}</i>(${item.issue}), ${item.pages}.</span>
       </div>
       <!-- use author styling for revert parameters -->
-      <div class="author_pub" py:if="edit and user.is_staff">
+      <div class="author_pub" py:if="edit and user.is_staff and item.item_type!='HEADING'">
             <span><i>Revert Parms: </i></span>
             <span py:for="k,v in item.CALLNO_PREFIX_CHOICES">
                 <span py:if="int(item.orig_prefix)==int(k)">