diff --git a/include/class.collaborator.php b/include/class.collaborator.php index 94e97fee65f55a37d9cff4f27707fee0934a742a..dc35a436f06c3ee2f5b2e0c1c9cb5847be864970 100644 --- a/include/class.collaborator.php +++ b/include/class.collaborator.php @@ -168,6 +168,8 @@ implements EmailContact, ITicketUser { static function create($vars=false) { $inst = new static($vars); + $inst->setFlag(Collaborator::FLAG_ACTIVE, true); + $inst->setFlag(Collaborator::FLAG_CC, true); $inst->created = SqlFunction::NOW(); return $inst; } diff --git a/include/staff/templates.inc.php b/include/staff/templates.inc.php index 0ed4dea249352587ccc084b28e835ee58e0ed102..e261a903c759d39c4ceff7fc8e62059292daf8ac 100644 --- a/include/staff/templates.inc.php +++ b/include/staff/templates.inc.php @@ -106,7 +106,7 @@ else if($ids && in_array($row['tpl_id'],$ids)) $sel=true; - $default=($defaultTplId==$row['tpl_id'])?'<small class="fadded">('.__('System Default').')</small>':''; + $default=($defaultTplId==$row['tpl_id'])?'<small class="faded">('.__('System Default').')</small>':''; ?> <tr id="<?php echo $row['tpl_id']; ?>"> <td align="center"> diff --git a/include/staff/templates/tickets-actions.tmpl.php b/include/staff/templates/tickets-actions.tmpl.php index 0535a5af2832a7da0354b6fa53dc88373ff6f6ca..2735fc70ea690421fd24aa066e927829cd8792fa 100644 --- a/include/staff/templates/tickets-actions.tmpl.php +++ b/include/staff/templates/tickets-actions.tmpl.php @@ -71,7 +71,6 @@ $(function() { +'?count='+count +'&tids='+tids.join(',') +'&_uid='+new Date().getTime(); - console.log(tids); $.dialog(url, [201], function (xhr) { $.pjax.reload('#pjax-container'); }); diff --git a/scp/js/scp.js b/scp/js/scp.js index 4f67a74d18739cbde9cd81f00186f5e9062e5660..e016087d3bfb0fb13260e7500736f6c40eb0535c 100644 --- a/scp/js/scp.js +++ b/scp/js/scp.js @@ -801,7 +801,7 @@ $.confirm = function(message, title, options) { .append($('<span class="buttons pull-left"></span>') .append($('<input type="button" class="close"/>') .attr('value', __('Cancel')) - .click(function() { hide(); }) + .click(function() { hide(); D.resolve(false); }) )).append($('<span class="buttons pull-right"></span>') .append($('<input type="button"/>') .attr('value', __('OK')) diff --git a/setup/test/tests/stubs.php b/setup/test/tests/stubs.php index 6a7b0d285ea0e9898f600365ca692f29c768f1c0..4cb35183c3ea3593ff0efc0b20babd1ad7f5e244 100644 --- a/setup/test/tests/stubs.php +++ b/setup/test/tests/stubs.php @@ -223,6 +223,8 @@ class Mail_mime { function setTXTBody() {} function setHTMLBody() {} function addCc() {} + function addTo() {} + function addBcc() {} } class mPDF {