From: Art Rhyno <art632000@yahoo.ca>
Date: Sun, 10 Jul 2011 00:01:50 +0000 (-0400)
Subject: Clean up item update logic.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=80207b682bb17e4f0672a2e2811b0b235439a548;p=Syrup.git

Clean up item update logic.

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

diff --git a/conifer/syrup/views/items.py b/conifer/syrup/views/items.py
index cda02bc..c262d4e 100644
--- a/conifer/syrup/views/items.py
+++ b/conifer/syrup/views/items.py
@@ -392,33 +392,29 @@ def item_edit(request, site_id, item_id):
                 callno_option = request.POST.get('orig_callno')
                 suffix_option = request.POST.get('orig_suffix')
                 suppress_option = request.POST.get('suppress_item')
-                update_status = True
+                update_status = False
 
+                #only update the Catalogue
                 if update_option == 'Cat':
                     update_status = opensrf.ils_item_update(item.barcode, prefix_option,
                                                             callno_option, suffix_option,
                                                             modifier_option, location_option)
-                    # we need to carry over suppress flag for instances where a call number
-                    # is modified for a second copy - this might be a common workflow
-                    if suppress_option == None:
-                        item.suppress_item = False
-                    else:
-                        item.suppress_item = True
-                    item.save()
 
-                #leave values alone if update failed
-                if update_status and update_option == 'One':
+                #only update Syrup
+                if update_option == 'One':
                     item.circ_desk = location_option
                     item.circ_modifier = modifier_option
                     item.orig_prefix = prefix_option
                     item.orig_callno = callno_option
                     item.orig_suffix = suffix_option
                     item.save()
+                    update_option = True
 
                 if not update_status:
                     return simple_message(_('Unable to update'),
                                           _('Sorry, unable to update at this time, please try again.'))
 
+                #wipe Syrup values
                 if update_option == 'Zap':
                     item.evergreen_update = ''
                     item.barcode = ''