adding ITF2 tooltip to Source's ID text entry.

replace a few 'dirty' methods with 'is_dirty'.

bauble/plugins/garden/accession.py

@@ -863,7 +863,9 @@ class AccessionEditorView(editor.GenericEditorView):
         'acc_ok_and_add_button': _('Save your changes changes and add a '
                                    'plant to this accession.'),
         'acc_next_button': _('Save your changes changes and add another '
-                             'accession.')
+                             'accession.'),
+
+        'sources_code_entry': "ITF2 - E7 - Donor's Accession Identifier - donacc",
         }
 
     def __init__(self, parent=None):
@@ -1028,7 +1030,7 @@ def setup_column(tree, column, cell, prop):
                 model.append([voucher])
         treeview.set_model(model)
 
-    def dirty(self):
+    def is_dirty(self):
         return self._dirty
 
     def on_cell_edited(self, cell, path, new_text, data):
@@ -1107,7 +1109,7 @@ def __init__(self, parent, model, view, session):
             set_expanded(True)
         self._dirty = False
 
-    def dirty(self):
+    def is_dirty(self):
         return self._dirty
 
     def refresh_view(self):
@@ -1497,10 +1499,10 @@ def start(self):
                 active = self.garden_prop_str
         self.populate_source_combo(active)
 
-    def dirty(self):
-        return self._dirty or self.source_prop_presenter.dirty() or \
-            self.prop_chooser_presenter.dirty() or \
-            self.collection_presenter.dirty()
+    def is_dirty(self):
+        return self._dirty or self.source_prop_presenter.is_dirty() or \
+            self.prop_chooser_presenter.is_dirty() or \
+            self.collection_presenter.is_dirty()
 
     def refresh_sensitivity(self):
         logger.warning('refresh_sensitivity: %s' % str(self.problems))
@@ -1958,10 +1960,10 @@ def on_loc_button_clicked(self, button, target_widget, target_field):
             self.view.widget_set_value(target_widget, location)
             self.set_model_attr(target_field, location)
 
-    def dirty(self):
+    def is_dirty(self):
         presenters = [self.ver_presenter, self.voucher_presenter,
                       self.notes_presenter, self.source_presenter]
-        dirty_kids = [p.dirty() for p in presenters]
+        dirty_kids = [p.is_dirty() for p in presenters]
         return self._dirty or True in dirty_kids
 
     def on_recvd_type_comboentry_changed(self, combo, *args):
@@ -2124,7 +2126,7 @@ def refresh_sensitivity(self):
         else:
             self.view.widgets.acc_id_qual_rank_combo.set_sensitive(False)
 
-        sensitive = self.dirty() and self.validate() \
+        sensitive = self.is_dirty() and self.validate() \
             and not self.problems \
             and not self.source_presenter.all_problems() \
             and not self.ver_presenter.problems \
@@ -2227,7 +2229,7 @@ def handle_response(self, response):
                     #
                     # msg = _('Some required fields have not been completed')
                     return False
-                if self.presenter.dirty():
+                if self.presenter.is_dirty():
                     self.commit_changes()
                     self._committed.append(self.model)
             except DBAPIError, e:
@@ -2242,8 +2244,8 @@ def handle_response(self, response):
                 utils.message_details_dialog(msg, traceback.format_exc(),
                                              gtk.MESSAGE_ERROR)
                 return False
-        elif self.presenter.dirty() and utils.yes_no_dialog(not_ok_msg) \
-                or not self.presenter.dirty():
+        elif self.presenter.is_dirty() and utils.yes_no_dialog(not_ok_msg) \
+                or not self.presenter.is_dirty():
             self.session.rollback()
             return True
         else:

bauble/plugins/garden/location.py

@@ -326,7 +326,7 @@ def on_loc_merge_button_clicked(self, entry, *args):
     def refresh_sensitivity(self):
         sensitive = False
         ignore = ('id')
-        if self.dirty() and not \
+        if self.is_dirty() and not \
                 utils.get_invalid_columns(self.model, ignore_columns=ignore):
             sensitive = True
         self.view.set_accept_buttons_sensitive(sensitive)
@@ -337,7 +337,7 @@ def set_model_attr(self, attr, value, validator=None):
         self._dirty = True
         self.refresh_sensitivity()
 
-    def dirty(self):
+    def is_dirty(self):
         return self._dirty
 
     def refresh_view(self):
@@ -391,7 +391,7 @@ def handle_response(self, response):
         not_ok_msg = 'Are you sure you want to lose your changes?'
         if response == gtk.RESPONSE_OK or response in self.ok_responses:
             try:
-                if self.presenter.dirty():
+                if self.presenter.is_dirty():
                     self.commit_changes()
                 self._committed.append(self.model)
             except DBAPIError, e:
@@ -408,9 +408,9 @@ def handle_response(self, response):
                                              gtk.MESSAGE_ERROR)
                 self.session.rollback()
                 return False
-        elif self.presenter.dirty() \
+        elif self.presenter.is_dirty() \
                 and utils.yes_no_dialog(not_ok_msg) \
-                or not self.presenter.dirty():
+                or not self.presenter.is_dirty():
             self.session.rollback()
             return True
         else:

bauble/plugins/garden/propagation.py

@@ -359,7 +359,7 @@ def __init__(self, parent, model, view, session):
             tab_box.pack_start(box, expand=False, fill=True)
         self._dirty = False
 
-    def dirty(self):
+    def is_dirty(self):
         return self._dirty
 
     def add_propagation(self):
@@ -608,7 +608,7 @@ def _rooted_data_func(column, cell, model, treeiter, prop):
         self.view.connect('rooted_remove_button', "clicked",
                           self.on_rooted_remove_clicked)
 
-    def dirty(self):
+    def is_dirty(self):
         return self._dirty
 
     def set_model_attr(self, field, value, validator=None):
@@ -735,7 +735,7 @@ def __init__(self, parent, model, view, session):
         utils.setup_date_button(self.view, 'seed_date_planted_entry',
                                 'seed_date_planted_button')
 
-    def dirty(self):
+    def is_dirty(self):
         return self._dirty
 
     def set_model_attr(self, field, value, validator=None):
@@ -837,11 +837,11 @@ def on_prop_type_changed(self, combo, *args):
         if not self.model.date:
             self.view.widgets.prop_date_entry.emit('changed')
 
-    def dirty(self):
+    def is_dirty(self):
         if self.model.prop_type == u'UnrootedCutting':
-            return self._cutting_presenter.dirty() or self._dirty
+            return self._cutting_presenter.is_dirty() or self._dirty
         elif self.model.prop_type == u'Seed':
-            return self._seed_presenter.dirty() or self._dirty
+            return self._seed_presenter.is_dirty() or self._dirty
         else:
             return self._dirty
 
@@ -936,8 +936,8 @@ def set_model_attr(self, attr, value, validator=None):
     def refresh_sensitivity(self):
         self.parent_ref().refresh_sensitivity()
 
-    def dirty(self):
-        return super(SourcePropagationPresenter, self).dirty() or self._dirty
+    def is_dirty(self):
+        return super(SourcePropagationPresenter, self).is_dirty() or self._dirty
 
 
 class PropagationEditorPresenter(PropagationPresenter):
@@ -1063,7 +1063,7 @@ def handle_response(self, response, commit=True):
         if response == gtk.RESPONSE_OK or response in self.ok_responses:
             try:
                 self._return = self.model
-                if self.presenter.dirty() and commit:
+                if self.presenter.is_dirty() and commit:
                     self.commit_changes()
             except DBAPIError, e:
                 msg = _('Error committing changes.\n\n%s') % \
@@ -1080,8 +1080,8 @@ def handle_response(self, response, commit=True):
                                              gtk.MESSAGE_ERROR)
                 self.session.rollback()
                 return False
-        elif self.presenter.dirty() and utils.yes_no_dialog(not_ok_msg) \
-                or not self.presenter.dirty():
+        elif self.presenter.is_dirty() and utils.yes_no_dialog(not_ok_msg) \
+                or not self.presenter.is_dirty():
             self.session.rollback()
             return True
         else:

bauble/plugins/garden/source.py

@@ -120,6 +120,7 @@ class Source(db.Base):
     """connected 1-1 to Accession, this class adds fields to Accession
     """
     __tablename__ = 'source'
+    # ITF2 - E7 - Donor's Accession Identifier - donacc
     sources_code = Column(Unicode(32))
 
     accession_id = Column(Integer, ForeignKey('accession.id'), unique=True)

bauble/plugins/garden/test.py

@@ -1679,7 +1679,7 @@ def test_accession_note_nocreate_noupdatediff_existing(self):
                            'accession': u'010203',
                            'category': u'foto',
                            'date': '2014-01-01',
-                           'note': 'url://'
+                           'note': u'url://'
                            },
             create=False, update=False)
         self.assertTrue(obj is not None)
@@ -1692,7 +1692,7 @@ def test_accession_note_nocreate_updatediff_existing(self):
                            'accession': u'010203',
                            'category': u'foto',
                            'date': '2014-01-01',
-                           'note': 'url://'
+                           'note': u'url://'
                            },
             create=False, update=True)
         self.assertTrue(obj is not None)