diff --git a/module/project/control.php b/module/project/control.php index 0440c820b5..df020ebd52 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -519,12 +519,13 @@ class project extends control $extra = str_replace(array(',', ' '), array('&', ''), $extra); parse_str($extra, $output); - $name = ''; - $code = ''; - $team = ''; - $whitelist = ''; - $acl = 'private'; - $auth = 'extend'; + $name = ''; + $code = ''; + $team = ''; + $whitelist = ''; + $acl = 'private'; + $auth = 'extend'; + $hasProduct = 1; $products = array(); $productPlans = array(); @@ -541,6 +542,7 @@ class project extends control $whitelist = $copyProject->whitelist; $programID = $copyProject->parent; $model = $copyProject->model; + $hasProduct = $copyProject->hasProduct; $products = $this->product->getProducts($copyProjectID); foreach($products as $product) @@ -585,6 +587,7 @@ class project extends control $this->view->acl = $acl; $this->view->auth = $auth; $this->view->whitelist = $whitelist; + $this->view->hasProduct = $hasProduct; $this->view->copyProjectID = $copyProjectID; $this->view->programList = $this->program->getParentPairs(); $this->view->parentProgram = $parentProgram; diff --git a/module/project/js/create.js b/module/project/js/create.js index 9f0033e7bf..1bf6b54103 100644 --- a/module/project/js/create.js +++ b/module/project/js/create.js @@ -7,6 +7,8 @@ $(function() $('#productTitle, #linkPlan').closest('tr').toggle(hasProduct == 1); }); + $('[name=hasProduct]').change(); + $('#copyProjects a').click(function() { setCopyProject($(this).data('id')); diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 61b5c47d72..42ab1df25e 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -74,7 +74,7 @@ project->type;?> - project->projectTypeList, 1);?> + project->projectTypeList, $hasProduct, $copyProjectID ? 'disabled' : '');?> project->PM;?> @@ -212,6 +212,7 @@ goback, '', 'class="btn btn-wide"') : html::backButton();