Add custom role edition

3 files changed, 35 insertions, 16 deletions

diff --git a/app/Template/project_role/create.php b/app/Template/project_role/create.php
index 8eee8f70..d0092243 100644
--- a/app/Template/project_role/create.php
+++ b/app/Template/project_role/create.php
@@ -1,18 +1,16 @@
-<section id="main">
-    <div class="page-header">
-        <h2><?= t('New custom project role') ?></h2>
-    </div>
-    <form class="popover-form" method="post" action="<?= $this->url->href('ProjectRoleController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
-        <?= $this->form->csrf() ?>
-        <?= $this->form->hidden('project_id', $values) ?>
+<div class="page-header">
+    <h2><?= t('New custom project role') ?></h2>
+</div>
+<form class="popover-form" method="post" action="<?= $this->url->href('ProjectRoleController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+    <?= $this->form->csrf() ?>
+    <?= $this->form->hidden('project_id', $values) ?>
 
-        <?= $this->form->label(t('Role'), 'role') ?>
-        <?= $this->form->text('role', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
+    <?= $this->form->label(t('Role'), 'role') ?>
+    <?= $this->form->text('role', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
 
-        <div class="form-actions">
-            <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-            <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'ProjectRoleController', 'show', array(), false, 'close-popover') ?>
-        </div>
-    </form>
-</section>
+    <div class="form-actions">
+        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
+        <?= t('or') ?>
+        <?= $this->url->link(t('cancel'), 'ProjectRoleController', 'show', array(), false, 'close-popover') ?>
+    </div>
+</form>
diff --git a/app/Template/project_role/edit.php b/app/Template/project_role/edit.php
new file mode 100644
index 00000000..3aa9e5cf
--- /dev/null
+++ b/app/Template/project_role/edit.php
@@ -0,0 +1,17 @@
+<div class="page-header">
+    <h2><?= t('Edit custom project role') ?></h2>
+</div>
+<form class="popover-form" method="post" action="<?= $this->url->href('ProjectRoleController', 'update', array('project_id' => $project['id'], 'role_id' => $role['role_id'])) ?>" autocomplete="off">
+    <?= $this->form->csrf() ?>
+    <?= $this->form->hidden('project_id', $values) ?>
+    <?= $this->form->hidden('role_id', $values) ?>
+
+    <?= $this->form->label(t('Role'), 'role') ?>
+    <?= $this->form->text('role', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
+
+    <div class="form-actions">
+        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
+        <?= t('or') ?>
+        <?= $this->url->link(t('cancel'), 'ProjectRoleController', 'show', array(), false, 'close-popover') ?>
+    </div>
+</form>
diff --git a/app/Template/project_role/show.php b/app/Template/project_role/show.php
index 595416ac..81281a3e 100644
--- a/app/Template/project_role/show.php
+++ b/app/Template/project_role/show.php
@@ -27,6 +27,10 @@
                             <?= $this->url->link(t('Add a new column restriction'), 'ColumnMoveRestrictionController', 'create', array('project_id' => $project['id'], 'role_id' => $role['role_id']), false, 'popover') ?>
                         </li>
                         <li>
+                            <i class="fa fa-pencil fa-fw" aria-hidden="true"></i>
+                            <?= $this->url->link(t('Edit this role'), 'ProjectRoleController', 'edit', array('project_id' => $project['id'], 'role_id' => $role['role_id']), false, 'popover') ?>
+                        </li>
+                        <li>
                             <i class="fa fa-trash-o fa-fw" aria-hidden="true"></i>
                             <?= $this->url->link(t('Remove this role'), 'ProjectRoleController', 'confirm', array('project_id' => $project['id'], 'role_id' => $role['role_id']), false, 'popover') ?>
                         </li>