Fix javascript error while revert to default new property
Fix javascript error after click on permission row
Fix javascript error while revert to default new property

* origin/pr/12183:
  Fix javascript error after click on permission row
  Fix javascript error while revert to default new property
Fix javascript error while revert to default new property

* origin/master:
  Fix javascript error after click on permission row
  Fix javascript error while revert to default new property