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

Show error messages in dialog box to move tasks

This commit is contained in:
Frédéric Guillot 2016-10-21 07:41:52 -04:00
parent 6a3e435e89
commit c2e3f1eba9
30 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/TaskMovePositionController.php
View File

@ -36,7 +36,7 @@ class TaskMovePositionController extends BaseController
$values = $this->request->getJson();
if (! $this->helper->projectRole->canMoveTask($task['project_id'], $task['column_id'], $values['column_id'])) {
throw new AccessForbiddenException(e("You don't have the permission to move this task"));
throw new AccessForbiddenException(e('You are not allowed to move this task.'));
}
$result = $this->taskPositionModel->movePosition(

1
app/Locale/bs_BA/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/cs_CZ/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/da_DK/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/de_DE/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/el_GR/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/es_ES/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/fi_FI/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/fr_FR/translations.php
View File

@ -1278,4 +1278,5 @@ return array(
'This field is required' => 'Ce champ est requis',
'Moving a task is not permitted' => 'Déplaçer une tâche n\'est pas autorisé',
'This value must be in the range %d to %d' => 'Cette valeur doit être définie entre %d et %d',
'You are not allowed to move this task.' => 'Vous n\'êtes pas autorisé à déplacer cette tâche.',
);

1
app/Locale/hu_HU/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/id_ID/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/it_IT/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/ja_JP/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/ko_KR/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/my_MY/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/nb_NO/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/nl_NL/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/pl_PL/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/pt_BR/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
'This field is required' => 'Este campo é obrigatório',
'Moving a task is not permitted' => 'Mover uma tarefa não é permitido',
'This value must be in the range %d to %d' => 'Este valor precisa estar no intervalo %d até %d',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/pt_PT/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
'This field is required' => 'Este campo é obrigatório',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/ru_RU/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
'This field is required' => 'Заполните это поле',
'Moving a task is not permitted' => 'Перемещение задачи не разрешено',
'This value must be in the range %d to %d' => 'Значение должно находиться в диапазоне от %d до %d',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/sr_Latn_RS/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/sv_SE/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/th_TH/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/tr_TR/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

1
app/Locale/zh_CN/translations.php
View File

@ -1277,4 +1277,5 @@ return array(
// 'This field is required' => '',
// 'Moving a task is not permitted' => '',
// 'This value must be in the range %d to %d' => '',
// 'You are not allowed to move this task.' => '',
);

4
app/Template/task_move_position/show.php
View File

@ -28,6 +28,10 @@
<label><input type="radio" value="after" v-model="positionChoice"><?= t('Insert after this task') ?></label>
</div>
<div v-if="errorMessage">
<div class="alert alert-error">{{ errorMessage }}</div>
</div>
<submit-cancel
label-button="<?= t('Save') ?>"
label-or="<?= t('or') ?>"

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

File diff suppressed because one or more lines are too long

5
assets/js/components/submit-cancel.js
View File

@ -26,5 +26,10 @@ Vue.component('submit-cancel', {
onCancel: function () {
_KB.get('Popover').close();
}
},
events: {
'submitCancelled': function() {
this.loading = false;
}
}
});

18
assets/js/components/task-move-position.js
View File

@ -8,13 +8,15 @@ Vue.component('task-move-position', {
position: 1,
columns: [],
tasks: [],
positionChoice: 'before'
positionChoice: 'before',
errorMessage: ''
}
},
ready: function () {
this.columns = this.board[0].columns;
this.columnId = this.columns[0].id;
this.tasks = this.columns[0].tasks;
this.errorMessage = '';
},
methods: {
onChangeSwimlane: function () {
@ -50,6 +52,8 @@ Vue.component('task-move-position', {
});
},
onSubmit: function () {
var self = this;
if (this.positionChoice == 'after') {
this.position++;
}
@ -65,8 +69,16 @@ Vue.component('task-move-position', {
"swimlane_id": this.swimlaneId,
"position": this.position
}),
complete: function() {
window.location.reload(true);
statusCode: {
200: function() {
window.location.reload(true);
},
403: function(jqXHR) {
var response = JSON.parse(jqXHR.responseText);
self.errorMessage = response.message;
self.$broadcast('submitCancelled');
}
}
});
}