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

Add autocomplete dropdown on comment subject and email fields

This commit is contained in:
Frederic Guillot 2017-06-03 17:51:20 -04:00
parent dd8d7ef49d
commit 6b9b9d2d1c
7 changed files with 52 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -6,7 +6,7 @@ New features:
* Automatic action to assign tasks to its creator
* Add the possibility to create a comment when a task is sent by email
* Add dropdown menu to autocomplete email field from project members
* Add configurable list of predefined subjects when sending a task by email
* Add configurable list of predefined subjects when sending a task or a a comment by email
Version 1.0.44 (May 28, 2017)
-----------------------------

1
app/Controller/CommentMailController.php
View File

@ -20,6 +20,7 @@ class CommentMailController extends BaseController
'errors' => $errors,
'task' => $task,
'project' => $project,
'members' => $this->projectPermissionModel->getMembersWithEmail($project['id']),
)));
}

32
app/Template/comment_mail/create.php
View File

@ -1,7 +1,7 @@
<div class="page-header">
<h2><?= t('Create and send a comment by email') ?></h2>
</div>
<form method="post" action="<?= $this->url->href('CommentMailController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
<form method="post" action="<?= $this->url->href('CommentMailController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off" class="js-mail-form">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('task_id', $values) ?>
<?= $this->form->hidden('user_id', $values) ?>
@ -9,9 +9,39 @@
<?= $this->form->label(t('Email'), 'email') ?>
<?= $this->form->email('email', $values, $errors, array('autofocus', 'required', 'tabindex="1"')) ?>
<?php if (! empty($members)): ?>
<div class="dropdown">
<a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-address-card-o"></i><i class="fa fa-caret-down"></i></a>
<ul>
<?php foreach ($members as $member): ?>
<li data-email="<?= $this->text->e($member['email']) ?>" class="js-autocomplete-email">
<?= $this->text->e($this->user->getFullname($member)) ?>
</li>
<?php endforeach ?>
</ul>
</div>
<?php endif ?>
<?= $this->form->label(t('Subject'), 'subject') ?>
<?= $this->form->text('subject', $values, $errors, array('required', 'tabindex="2"')) ?>
<?php if (! empty($project['predefined_email_subjects'])): ?>
<div class="dropdown">
<a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-archive"></i><i class="fa fa-caret-down"></i></a>
<ul>
<?php foreach (explode("\r\n", trim($project['predefined_email_subjects'])) as $subject): ?>
<?php $subject = trim($subject); ?>
<?php if (! empty($subject)): ?>
<li data-subject="<?= $this->text->e($subject) ?>" class="js-autocomplete-subject">
<?= $this->text->e($subject) ?>
</li>
<?php endif ?>
<?php endforeach ?>
</ul>
</div>
<?php endif ?>
<?= $this->form->textEditor('comment', $values, $errors, array('required' => true, 'tabindex' => 3)) ?>
<?= $this->modal->submitButtons(array(

3
app/Template/task_mail/create.php
View File

@ -1,7 +1,7 @@
<div class="page-header">
<h2><?= $this->text->e($task['title']) ?> &gt; <?= t('Send by email') ?></h2>
</div>
<form method="post" action="<?= $this->url->href('TaskMailController', 'send', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off" class="js-task-mail-form">
<form method="post" action="<?= $this->url->href('TaskMailController', 'send', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off" class="js-mail-form">
<?= $this->form->csrf() ?>
<?= $this->form->label(t('Email'), 'email') ?>
@ -22,6 +22,7 @@
<?= $this->form->label(t('Subject'), 'subject') ?>
<?= $this->form->text('subject', $values, $errors, array('required', 'tabindex="2"')) ?>
<?php if (! empty($project['predefined_email_subjects'])): ?>
<div class="dropdown">
<a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-archive"></i><i class="fa fa-caret-down"></i></a>

4
assets/js/app.min.js vendored
View File

File diff suppressed because one or more lines are too long

24
assets/js/components/autocomplete-email.js
View File

@ -1,25 +1,21 @@
KB.onClick('.js-autocomplete-email', function (e) {
var email = KB.dom(e.target).data('email');
var emailField = KB.find('.js-mail-form input[type="email"]');
if (email) {
var emailField = KB.find('.js-task-mail-form input[type="email"]');
if (emailField) {
emailField.attr('value', email);
_KB.controllers['Dropdown'].close();
}
if (email && emailField) {
emailField.build().value = email;
}
_KB.controllers['Dropdown'].close();
});
KB.onClick('.js-autocomplete-subject', function (e) {
var subject = KB.dom(e.target).data('subject');
var subjectField = KB.find('.js-mail-form input[name="subject"]');
if (subject) {
var subjectField = KB.find('.js-task-mail-form input[name="subject"]');
if (subjectField) {
subjectField.attr('value', subject);
_KB.controllers['Dropdown'].close();
}
if (subject && subjectField) {
subjectField.build().value = subject;
}
_KB.controllers['Dropdown'].close();
});

6
assets/js/src/Dropdown.js
View File

@ -52,7 +52,11 @@ Kanboard.Dropdown.prototype.listen = function() {
if ($(e.target).is('li')) {
KB.trigger('dropdown.clicked');
$(this).find('a:visible')[0].click(); // Calling native click() not the jQuery one
var element = $(this).find('a:visible');
if (element.length > 0) {
element[0].click(); // Calling native click() not the jQuery one
}
}
});
};