Plans to alter and extend an Edinburgh pub ahead of its re-opening have been approved, although the original plan to add a restaurant had to be scrapped.