Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to allow custom task types in CSV import #138

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix to allow custom task types in CSV import #138

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b97fe4a
Fix double slash in URI
GeekJosh Aug 31, 2016
0bae5ca
Enable custom task types in CSV import
GeekJosh Sep 21, 2016
019b282
Revert "Fix double slash in URI"
Sep 21, 2016
a219b45
Revert "Enable custom task types in CSV import"
Sep 21, 2016
de1f812
Revert "Revert "Enable custom task types in CSV import""
Sep 21, 2016
1942dfe
Although validation passed, id's were still hard coded
Sep 21, 2016
645585b
Wrapped in strtolower to make case insensitive
Sep 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 21 additions & 22 deletions app/Controller/ProjectsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,14 @@ function importexport($proj_id='') {
function csv_dataimport() {
$project_id = $this->data['proj_id'];
$project_uid = $this->data['proj_uid'];
$task_type_arr = array('enhancement','enh','bug','research n do','rnd','quality assurance','qa','unit testing','unt','maintenance','mnt','others','oth','release','rel','update','upd','development','dev');

$task_type_arr = array();
$this->LoadModel('Type');
$allTasks = $this->Type->getAllTypes();
foreach($allTasks as $taskType){
array_push($task_type_arr, strtolower($taskType['Type']['short_name']), strtolower($taskType['Type']['name']));
}

$task_status_arr = array('new','close','wip','resolve','resolved','closed');
$this->loadModel('User');
$this->loadModel('ProjectUser');
Expand Down Expand Up @@ -1800,27 +1807,19 @@ function confirm_import() {

function get_type_id($type){
$type = strtolower($type);
if($type=='bug'){
return 1;
}elseif($type=='enhancement' || $type=='enh' ){
return 3;
}elseif($type=='research n do' || $type=='rnd' ){
return 4;
}elseif($type=='quality assurance' || $type=='qa'){
return 5;
}elseif($type=='unit testing' || $type=='unt'){
return 6;
}elseif($type=='maintenance' || $type=='mnt'){
return 7;
}elseif($type=='others' || $type=='oth'){
return 8;
}elseif($type=='release' || $type=='rel' ){
return 9;
}elseif($type=='update' || $type=='upd' ){
return 10;
}else{
return 2;

// iterate over task types to build indexed array with id
$task_type_arr = array();
$this->LoadModel('Type');
$allTasks = $this->Type->getAllTypes();
foreach($allTasks as $taskType){
$task_type_arr[strtolower($taskType['Type']['short_name'])] = $taskType['Type']['id'];
$task_type_arr[strtolower($taskType['Type']['name'])] = $taskType['Type']['id'];
}

// if the type exists in the array, return it's id
// if not, return 8 (other)
return array_key_exists($type, $task_type_arr) ? $task_type_arr[$type] : 8;
}
/**
* @method public download_sample_csv_file
Expand Down Expand Up @@ -2207,4 +2206,4 @@ function validateTaskType(){
echo json_encode($jsonArr);exit;
}
}
?>
?>