diff --git a/tailbone/templates/master/index.mako b/tailbone/templates/master/index.mako index 15985e5b..6889ac44 100644 --- a/tailbone/templates/master/index.mako +++ b/tailbone/templates/master/index.mako @@ -34,7 +34,7 @@ % endif - % if master.mergeable and request.has_perm('{}.merge'.format(permission_prefix)): + % if master.mergeable and master.has_perm('merge'): $('form[name="merge-things"] button').button('option', 'disabled', $('.grid').gridcore('count_selected') != 2); @@ -266,29 +266,6 @@ % endif -<%def name="modify_this_page_vars()"> - ${parent.modify_this_page_vars()} - - - <%def name="make_this_page_component()"> ${parent.make_this_page_component()}