Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/templates/tracker/admin-labels-page.ezt b/templates/tracker/admin-labels-page.ezt
index e8cb7ae..0acd465 100644
--- a/templates/tracker/admin-labels-page.ezt
+++ b/templates/tracker/admin-labels-page.ezt
@@ -10,7 +10,7 @@
 
  <h4>Predefined issue labels</h4>
  <div class="section">
-  [if-any perms.EditProject]
+  [if-any can_edit_project]
     <table class="vt">
      <tr><td>
        <textarea name="predefinedlabels" rows="12" cols="75" style="tab-size:18">[labels_text]</textarea>
@@ -47,7 +47,7 @@
   [end]
  </div>
 
- [if-any perms.EditProject]
+ [if-any can_edit_project]
    <input type="submit" id="savechanges" name="btn" value="Save changes" class="submit">
  [end]
 
@@ -111,7 +111,7 @@
   </tbody>
   </table>
   <div class="list-foot"></div>
-  [if-any perms.EditProject]
+  [if-any can_edit_project]
     <p><a href="/p/[projectname]/fields/create" class="buttonify primary">Add field</a></p>
   [end]
  </div>