Merge branch 'master' of github.com:easysoft/zentaopms

module/block/view/admin.html.php

@@ -36,7 +36,7 @@ include '../../common/view/chosen.html.php';
   <div class="form-group">
     <div class="col-sm-7 col-sm-offset-3">
       <button type="submit" class="btn btn-wide btn-primary"><?php echo $lang->save;?></button>
-      <button type="cancel" class="btn btn-wide" data-dismiss="modal"><?php echo $lang->cancel;?></button>
+      <button type="button" class="btn btn-wide" data-dismiss="modal"><?php echo $lang->cancel;?></button>
     </div>
   </div>
 </form>

module/build/model.php

@@ -294,7 +294,7 @@ class buildModel extends model
             $bug->lastEditedBy   = $this->app->user->account;
             $bug->lastEditedDate = $now;
             $bug->resolution     = 'fixed';
-            $bug->resolvedBuild  = $build->name;
+            $bug->resolvedBuild  = $build->id;
             $this->dao->update(TABLE_BUG)->data($bug)->where('id')->eq($bug->id)->exec();
             $this->action->create('bug', $bug->id, 'Resolved', '', 'fixed', $bug->resolvedBy);
         }

module/testtask/model.php

@@ -286,6 +286,7 @@ class testtaskModel extends model
             ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build = t3.id')
             ->where('t1.deleted')->eq(0)
             ->andWhere('t1.owner')->eq($account)
+            ->andWhere('t2.id')->in($this->app->user->view->projects)
             ->beginIF($type == 'wait')->andWhere('t1.status')->ne('done')->fi()
             ->beginIF($type == 'done')->andWhere('t1.status')->eq('done')->fi()
             ->orderBy($orderBy)

module/todo/js/create.js

@@ -15,11 +15,7 @@ $(function()
         {
             $('.cycleConfig').removeClass('hidden');
             $('#switchDate').closest('.input-group-addon').addClass('hidden');
-            $('#type').find('option').each(function()
-            {
-                var type = $(this).val();
-                if(type == 'bug' || type == 'task' || type == 'story') $(this).addClass('hidden');
-            })
+            $('#type').closest('tr').addClass('hidden');
         }
         else
         {

module/todo/model.php

@@ -59,6 +59,7 @@ class todoModel extends model
                 $todo->config['month'] = join(',', $todo->config['month']);
             }
             $todo->config = json_encode($todo->config);
+            $todo->type   = 'cycle';
         }
 
         $todo = $this->loadModel('file')->processImgURL($todo, $this->config->todo->editor->create['id'], $this->post->uid);