← Back to branch summary

~kevang/mnemosyne-proj/grade-shortcuts-improvements

« back to all changes in this revision

Viewing changes to mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py

  • Committer: Peter.Bienstman at UGent
  • Date: 2015-02-02 20:16:47 UTC
  • Revision ID: peter.bienstman@ugent.be-20150202201647-is5jnbba1hy569g3
Finish merging.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py
1094
1094
            repr([fact_view.id for fact_view in card_type.fact_views]),
1095
1095
            repr(card_type.keyboard_shortcuts),
1096
1096
            self._repr_extra_data(card_type.extra_data)))
 
1097
        # When we are syncing/merging, make sure we correctly insert the
 
1098
        # class in the inheritance hierarchy.
 
1099
        card_type = self.card_type(card_type.id, is_id_internal=False)
1097
1100
        self.component_manager.register(card_type)
1098
1101
        self.log().added_card_type(card_type)
1099
1102
        # When syncing (but not when importing), don't bother to check for