rattail/tailbone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Tweak verbiage for merge template etc.

Browse source
This commit is contained in:
Lance Edgar 2016-11-09 02:17:01 -06:00
parent 63d89b696a
commit ba1fa6d617
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tailbone/templates/master/merge.mako
View file

@ -91,7 +91,13 @@
You are about to <strong>merge</strong> two ${model_title} records, You are about to <strong>merge</strong> two ${model_title} records,
(possibly) along with various related data.&nbsp; The tool you are using now (possibly) along with various related data.&nbsp; The tool you are using now
is somewhat generic and is not able to give you the full picture of the is somewhat generic and is not able to give you the full picture of the
implications of this merge.&nbsp; You are urged to proceed with caution! implications of this merge.&nbsp; You are urged to proceed with caution!&nbsp;
</p>
<p class="warning">
<strong>Unless you know what you're doing, a good rule of thumb (though still no
guarantee) is to merge <em>only</em> if the "resulting" column is all-white.</strong>&nbsp;
(You may be able to swap kept/removed in order to achive this.)
</p> </p>
<p> <p>

2
tailbone/views/master.py
View file

@ -429,7 +429,7 @@ class MasterView(View):
try: try:
self.validate_merge(object_to_remove, object_to_keep) self.validate_merge(object_to_remove, object_to_keep)
except Exception as error: except Exception as error:
self.request.session.flash("Requested merge cannot proceed (maybe swap keep/remove and try again?): {}".format(error), 'error') self.request.session.flash("Requested merge cannot proceed (maybe swap kept/removed and try again?): {}".format(error), 'error')
else: else:
self.merge_objects(object_to_remove, object_to_keep) self.merge_objects(object_to_remove, object_to_keep)
self.request.session.flash("{} has been merged into {}".format(msg, object_to_keep)) self.request.session.flash("{} has been merged into {}".format(msg, object_to_keep))