AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve user creation form to automatically add project member and enable notifications

Browse Source
This commit is contained in:
Frederic Guillot
2015-06-27 15:40:42 -04:00
parent 6c772de184
commit 7cae104de1
6 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Controller/User.php
View File

@@ -69,7 +69,6 @@ class User extends Base
$this->response->html( $this->response->html(
$this->template->layout('user/index', array( $this->template->layout('user/index', array(
'board_selector' => $this->projectPermission->getAllowedProjects($this->userSession->getId()), 'board_selector' => $this->projectPermission->getAllowedProjects($this->userSession->getId()),
'projects' => $this->project->getList(),
'title' => t('Users').' ('.$paginator->getTotal().')', 'title' => t('Users').' ('.$paginator->getTotal().')',
'paginator' => $paginator, 'paginator' => $paginator,
))); )));
@@ -105,14 +104,19 @@ class User extends Base
if ($valid) { if ($valid) {
$project_id = empty($values['project_id']) ? 0 : $values['project_id'];
unset($values['project_id']);
$user_id = $this->user->create($values); $user_id = $this->user->create($values);
if ($user_id !== false) { if ($user_id !== false) {
$this->projectPermission->addMember($project_id, $user_id);
$this->session->flash(t('User created successfully.')); $this->session->flash(t('User created successfully.'));
$this->response->redirect($this->helper->url->to('user', 'show', array('user_id' => $user_id))); $this->response->redirect($this->helper->url->to('user', 'show', array('user_id' => $user_id)));
} }
else { else {
$this->session->flashError(t('Unable to create your user.')); $this->session->flashError(t('Unable to create your user.'));
$values['project_id'] = $project_id;
} }
} }
@@ -128,7 +132,6 @@ class User extends Base
{ {
$user = $this->getUser(); $user = $this->getUser();
$this->response->html($this->layout('user/show', array( $this->response->html($this->layout('user/show', array(
'projects' => $this->projectPermission->getAllowedProjects($user['id']),
'user' => $user, 'user' => $user,
'timezones' => $this->config->getTimezones(true), 'timezones' => $this->config->getTimezones(true),
'languages' => $this->config->getLanguages(true), 'languages' => $this->config->getLanguages(true),
@@ -230,7 +233,7 @@ class User extends Base
} }
$this->response->html($this->layout('user/notifications', array( $this->response->html($this->layout('user/notifications', array(
'projects' => $this->projectPermission->getAllowedProjects($user['id']), 'projects' => $this->projectPermission->getMemberProjects($user['id']),
'notifications' => $this->notification->readSettings($user['id']), 'notifications' => $this->notification->readSettings($user['id']),
'user' => $user, 'user' => $user,
))); )));

3
app/Template/user/index.php
View File

@@ -42,9 +42,6 @@
<td> <td>
<?= $user['twofactor_activated'] ? t('Yes') : t('No') ?> <?= $user['twofactor_activated'] ? t('Yes') : t('No') ?>
</td> </td>
<td>
<?= (isset($user['default_project_id']) && isset($projects[$user['default_project_id']])) ? $this->e($projects[$user['default_project_id']]) : t('None'); ?>
</td>
<td> <td>
<?php if ($user['notifications_enabled'] == 1): ?> <?php if ($user['notifications_enabled'] == 1): ?>
<?= t('Enabled') ?> <?= t('Enabled') ?>

38
app/Template/user/new.php
View File

@@ -9,28 +9,36 @@
<?= $this->form->csrf() ?> <?= $this->form->csrf() ?>
<?= $this->form->label(t('Username'), 'username') ?> <div class="form-column">
<?= $this->form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?><br/> <?= $this->form->label(t('Username'), 'username') ?>
<?= $this->form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?><br/>
<?= $this->form->label(t('Name'), 'name') ?> <?= $this->form->label(t('Name'), 'name') ?>
<?= $this->form->text('name', $values, $errors) ?><br/> <?= $this->form->text('name', $values, $errors) ?><br/>
<?= $this->form->label(t('Email'), 'email') ?> <?= $this->form->label(t('Email'), 'email') ?>
<?= $this->form->email('email', $values, $errors) ?><br/> <?= $this->form->email('email', $values, $errors) ?><br/>
<?= $this->form->label(t('Password'), 'password') ?> <?= $this->form->label(t('Password'), 'password') ?>
<?= $this->form->password('password', $values, $errors, array('required')) ?><br/> <?= $this->form->password('password', $values, $errors, array('required')) ?><br/>
<?= $this->form->label(t('Confirmation'), 'confirmation') ?> <?= $this->form->label(t('Confirmation'), 'confirmation') ?>
<?= $this->form->password('confirmation', $values, $errors, array('required')) ?><br/> <?= $this->form->password('confirmation', $values, $errors, array('required')) ?><br/>
</div>
<?= $this->form->label(t('Timezone'), 'timezone') ?> <div class="form-column">
<?= $this->form->select('timezone', $timezones, $values, $errors) ?><br/> <?= $this->form->label(t('Add project member'), 'project_id') ?>
<?= $this->form->select('project_id', $projects, $values, $errors) ?><br/>
<?= $this->form->label(t('Language'), 'language') ?> <?= $this->form->label(t('Timezone'), 'timezone') ?>
<?= $this->form->select('language', $languages, $values, $errors) ?><br/> <?= $this->form->select('timezone', $timezones, $values, $errors) ?><br/>
<?= $this->form->checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?> <?= $this->form->label(t('Language'), 'language') ?>
<?= $this->form->select('language', $languages, $values, $errors) ?><br/>
<?= $this->form->checkbox('notifications_enabled', t('Enable notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
<?= $this->form->checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?>
</div>
<div class="form-actions"> <div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>

2
assets/css/app.css
View File

@@ -282,7 +282,7 @@ select:focus {
} }
.form-actions { .form-actions {
margin-top: 20px; padding-top: 20px;
clear: both; clear: both;
} }

2
assets/css/src/form.css
View File

@@ -77,7 +77,7 @@ select:focus {
} }
.form-actions { .form-actions {
margin-top: 20px; padding-top: 20px;
clear: both; clear: both;
} }

6
docs/user-management.markdown
View File

@@ -27,13 +27,13 @@ To add a new user, you must be administrator.
2. On the top, you have a link **New user** 2. On the top, you have a link **New user**
3. Fill the form and save 3. Fill the form and save
When you create a new user, you have to specify those values: ![New user](http://kanboard.net/screenshots/documentation/new-user.png)
When you create a new user, you have to specify at least those values:
- **username**: This is the unique identifier of your user (login) - **username**: This is the unique identifier of your user (login)
- **password**: The password of your user must have at least 6 characters - **password**: The password of your user must have at least 6 characters
Eventually, you can choose to assign a default project to this user and allow him to be administrator.
Edit users Edit users
---------- ----------