* Adjust upgrade module.

module/upgrade/control.php

@@ -260,11 +260,7 @@ class upgrade extends control
                 list($programID, $projectID) = $this->upgrade->createProgram(array(), $linkedSprints);
                 if(dao::isError()) die(js::error(dao::getError()));
 
-                //$productID = $this->upgrade->createProduct4Program($programID);
                 $this->upgrade->processMergedData($programID, $projectID, array(), $linkedSprints);
-
-                /* Link product. */
-                foreach($linkedSprints as $sprintID) $this->dao->replace(TABLE_PROJECTPRODUCT)->set('project')->eq($sprintID)->set('product')->eq($productID)->exec();
             }
             elseif($type == 'moreLink')
             {
@@ -276,7 +272,6 @@ class upgrade extends control
                     $this->upgrade->processMergedData(0, $projectID, array(), array($sprintID));
                 }
             }
-
             die(js::locate($this->createLink('upgrade', 'mergeProgram', "type=$type"), 'parent'));
         }
 

module/upgrade/js/mergeprogram.js

@@ -4,8 +4,8 @@ $(function()
     $('#source .cell').height($('#source').height());
     $('#programBox .cell').height($('#programBox').height() - 20);
 
-    PGMBegin = $('.programParams #begin').val();
-    PGMEnd   = $('.programParams #end').val();
+    PGMBegin = $('.PGMParams #begin').val();
+    PGMEnd   = $('.PGMParams #end').val();
     setPGMBegin(PGMBegin);
     setPGMEnd(PGMEnd);
 
@@ -129,7 +129,7 @@ function toggleProgram(obj)
     if($obj.length == 0) return false;
 
     var $programs  = $obj.closest('table').find('#programs');
-    var $programParams = $obj.closest('table').find('.programParams');
+    var $PGMParams = $obj.closest('table').find('.PGMParams');
     if($obj.prop('checked'))
     {
         $('form #newProject0').prop('checked', true);
@@ -137,13 +137,13 @@ function toggleProgram(obj)
 
         $('#PGMName').closest('tr').show();
         $programs.attr('disabled', 'disabled');
-        $programParams.removeClass('hidden');
+        $PGMParams.removeClass('hidden');
     }
     else
     {
         $('#PGMName').closest('tr').hide();
         $programs.removeAttr('disabled');
-        $programParams.addClass('hidden');
+        $PGMParams.addClass('hidden');
 
         toggleProject($('form #newProject0'));
     }
@@ -155,17 +155,17 @@ function toggleProject(obj)
     if($obj.length == 0) return false;
 
     var $projects  = $obj.closest('table').find('#projects');
-    var $programParams = $obj.closest('table').find('.programParams');
+    var $PGMParams = $obj.closest('table').find('.PGMParams');
     if($obj.prop('checked'))
     {
         $projects.attr('disabled', 'disabled');
-        $programParams.removeClass('hidden');
+        $PGMParams.removeClass('hidden');
         if(!$('form #newProgram0').prop('checked')) $('#PGMName').closest('tr').hide();
     }
     else
     {
         $projects.removeAttr('disabled');
-        $programParams.addClass('hidden');
+        $PGMParams.addClass('hidden');
 
         $('form #newProgram0').prop('checked', false);
         $('#programs').removeAttr('disabled');
@@ -182,7 +182,7 @@ function setPGMBegin(PGMBegin)
         if(begin < PGMBegin)
         {
             PGMBegin = begin;
-            $('.programParams #begin').val(PGMBegin);
+            $('.PGMParams #begin').val(PGMBegin);
         }
     });
 }
@@ -197,7 +197,7 @@ function setPGMEnd(PGMEnd)
         if(end > PGMEnd)
         {
             PGMEnd = end;
-            $('.programParams #end').val(PGMEnd);
+            $('.PGMParams #end').val(PGMEnd);
         }
     });
 }

module/upgrade/model.php

@@ -3937,6 +3937,7 @@ class upgradeModel extends model
     {
         $this->app->loadLang('program');
         $data = fixer::input('post')->get();
+        $account = isset($this->app->user->account) ? $this->app->user->account : '';
 
         if(!isset($data->programs))
         {
@@ -3949,7 +3950,7 @@ class upgradeModel extends model
             $program->status        = 'wait';
             $program->begin         = $data->begin;
             $program->end           = isset($data->end) ? $data->end : '';
-            $program->openedBy      = $this->app->user->account;
+            $program->openedBy      = $account;
             $program->openedDate    = helper::now();
             $program->openedVersion = $this->config->version;
             $program->acl           = 'open';
@@ -3989,7 +3990,7 @@ class upgradeModel extends model
             $project->end           = isset($data->end) ? $data->end : '';
             $project->PM            = $data->PM;
             $project->auth          = 'extend';
-            $project->openedBy      = $this->app->user->account;
+            $project->openedBy      = $account;
             $project->openedDate    = helper::now();
             $project->openedVersion = $this->config->version;
             $project->acl           = $data->acl;
@@ -4041,7 +4042,7 @@ class upgradeModel extends model
         $this->dao->update(TABLE_DOC)->set('PRJ')->eq($projectID)->where("lib IN(SELECT id from " . TABLE_DOCLIB . " WHERE type = 'project' and project " . helper::dbIN($sprintIdList) . ')')->exec();
 
         /* Compute product acl. */
-        $products = $this->dao->select('id, acl')->from(TABLE_PRODUCT)->where('id')->in($productIdList)->fetchAll();
+        $products = $this->dao->select('id,program,acl')->from(TABLE_PRODUCT)->where('id')->in($productIdList)->fetchAll();
         foreach($products as $product)
         {
             if($product->program) continue;

module/upgrade/view/createprogram.html.php

@@ -32,23 +32,23 @@
     </td>
   </tr>
   <?php endif;?>
-  <tr class='programParams'>
+  <tr class='PGMParams'>
     <th class='w-90px'><?php echo $lang->program->PGMName;?></th>
     <td class='required'><?php echo html::input("PGMName", isset($programName) ? $programName : '', "class='form-control'");?></td>
   </tr>
-  <tr class='programParams'>
+  <tr class='PGMParams'>
     <th><?php echo $lang->program->PRJName;?></th>
     <td class='required'><?php echo html::input("PRJName", isset($sprintName) ? $sprintName : '', "class='form-control'");?></td>
   </tr>
-  <tr class='programParams'>
+  <tr class='PGMParams'>
     <th><?php echo $lang->program->PRJCode;?></th>
     <td><?php echo html::input("code", '', "class='form-control'");?></td>
   </tr>
-  <tr class='programParams'>
+  <tr class='PGMParams'>
     <th><?php echo $lang->program->PRJPM;?></th>
     <td><?php echo html::select('PM', array('' => '') + $users, '', "class='form-control chosen'");?></td>
   </tr>
-  <tr class='programParams'>
+  <tr class='PGMParams'>
     <th><?php echo $lang->program->dateRange;?></th>
     <td>
       <div class='input-group'>
@@ -64,7 +64,7 @@
       </div>
     </td>
   </tr>
-  <tr class='programParams'>
+  <tr class='PGMParams'>
     <th><?php echo $lang->project->acl;?></th>
     <td><?php echo nl2br(html::radio('acl', $lang->program->PGMPRJAclList, 'open', "onclick='setWhite(this.value);'", 'block'));?></td>
   </tr>