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

Add the possibility to make tags global from project settings

This commit is contained in:
Timo 2020-02-11 04:48:51 +01:00 committed by GitHub
parent f3945471b5
commit 2c98be3ead
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 63 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/Controller/ProjectTagController.php
View File

@ -121,4 +121,30 @@ class ProjectTagController extends BaseController
$this->response->redirect($this->helper->url->to('ProjectTagController', 'index', array('project_id' => $project['id'])));
}
public function confirmMakeGlobalTag()
{
$project = $this->getProject();
$tag = $this->getProjectTag($project);
$this->response->html($this->template->render('project_tag/make_global', array(
'tag' => $tag,
'project' => $project,
)));
}
public function makeGlobalTag(){
if ($this->userSession->isAdmin()) {
$project = $this->getProject();
$tag = $this->getProjectTag($project);
if ($this->tagModel->update($tag['id'], $tag['name'], $tag['color_id'], 0)) {
$this->flash->success(t('Tag updated successfully.'));
} else {
$this->flash->failure(t('Unable to update this tag.'));
}
$this->response->redirect($this->helper->url->to('ProjectTagController', 'index', array('project_id' => $project['id'])));
}
}
}

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

@ -1411,4 +1411,6 @@ return array(
'Task limits apply to each swimlane individually' => 'Aufgabenlimit gilt pro Swimlane',
'Task limits are applied to each swimlane individually' => 'Aufgabenlimit gilt pro Swimlane',
'Task limits are applied across swimlanes' => 'Aufgabenlimit gilt Swimlane übergreifend',
'Change to global tag' => 'Zu globalem Schlagwort machen',
'Do you really want to make the tag "%s" global?' => 'Das Schlagwort "%s" wirklich global machen?',
);

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

@ -1411,4 +1411,6 @@ return array(
'Task limits apply to each swimlane individually' => 'Les limites de tâches s\'appliquent à chaque swimlane individuellement',
'Task limits are applied to each swimlane individually' => 'Les limites de tâches sont appliquées à chaque swimlane individuellement',
'Task limits are applied across swimlanes' => 'Les limites de tâches sont appliquées entre les swimlanes',
// 'Change to global tag' => '',
// 'Do you really want to make the tag "%s" global?' => '',
);

18
app/Model/TagModel.php
View File

@ -160,12 +160,20 @@ class TagModel extends Base
* @param string $tag
* @return bool
*/
public function update($tag_id, $tag, $color_id = null)
public function update($tag_id, $tag, $color_id = null, $project_id = null)
{
return $this->db->table(self::TABLE)->eq('id', $tag_id)->update(array(
'name' => $tag,
'color_id' => $color_id,
));
if($project_id !== null){
return $this->db->table(self::TABLE)->eq('id', $tag_id)->update(array(
'name' => $tag,
'color_id' => $color_id,
'project_id' => $project_id
));
} else {
return $this->db->table(self::TABLE)->eq('id', $tag_id)->update(array(
'name' => $tag,
'color_id' => $color_id
));
}
}
/**

5
app/Template/project_tag/index.php
View File

@ -24,6 +24,11 @@
<li>
<?= $this->modal->medium('edit', t('Edit'), 'ProjectTagController', 'edit', array('tag_id' => $tag['id'], 'project_id' => $project['id'])) ?>
</li>
<?php if ($this->user->isAdmin()): ?>
<li>
<?= $this->modal->confirm('globe', t('Change to global tag'), 'ProjectTagController', 'confirmMakeGlobalTag', array('tag_id' => $tag['id'], 'project_id' => $project['id'])) ?>
</li>
<?php endif ?>
<li>
<?= $this->modal->confirm('trash-o', t('Remove'), 'ProjectTagController', 'confirm', array('tag_id' => $tag['id'], 'project_id' => $project['id'])) ?>
</li>

15
app/Template/project_tag/make_global.php Normal file
View File

@ -0,0 +1,15 @@
<div class="page-header">
<h2><?= t('Change to global tag') ?></h2>
</div>
<div class="confirm">
<p class="alert alert-info">
<?= t('Do you really want to make the tag "%s" global?', $tag['name']) ?>
</p>
<?= $this->modal->confirmButtons(
'ProjectTagController',
'makeGlobalTag',
array('tag_id' => $tag['id'], 'project_id' => $project['id'])
) ?>
</div>