[etersoft] Cherry-pick d2827f5d

.gitignore~

+/**/.htaccess
+/lib/*
+/template/en/custom
+/docs/en/html
+/docs/en/txt
+/docs/en/pdf
+/skins/custom
+/graphs
+/data
+/localconfig
+/index.html
+
+/skins/contrib/Dusk/admin.css
+/skins/contrib/Dusk/bug.css

js/etersoft/bugs-watcher.css~

+.bugs-watcher {
+  color: #009966 !important;
+}
+
+.worker::before {
+  content: ","
+}
+
+.worker:last-child::before {
+  content: "" !important
+}

js/etersoft/bugsWatcher.js~

+document.addEventListener('DOMContentLoaded', function() {
+
+  const url = `${window.location.origin}`;
+  const siteUrl = window.location.origin;
+
+  const bugID = location.href.split('=')[1];
+  const email = document.querySelector('#useremail').className;
+  const workTime = document.querySelector('#timespent').value;
+
+  const socket = io.connect(url, {'forceNew': true});
+
+  let userToken = !localStorage[siteUrl] ? undefined : JSON.parse(localStorage[siteUrl]).userToken;
+
+  socket.emit('addUser', { bugID: bugID, email: email });
+
+  function showUser (data) {
+
+    let workerEmail = data.email;
+    let workerId = data.id;
+    let workersList = document.querySelector("#workers").innerHTML !== "" ? Array.from(document.querySelectorAll("#workers > a")).map((elem) => { return elem.dataset["email"] }) : undefined;
+
+    if (!workersList || !workersList.includes(workerEmail)) {
+      fetch(`https://bugs.etersoft.ru/rest/user/${workerEmail}`).then((name) => { return name.json() }).then((name) => {
+        name = name.users[0].real_name;
+        let worker = `
+          <a href="maito:${workerEmail}" id="${workerId}" data-email="${workerEmail}" title="${name}">${name}</a><span class="worker ${workerId}"></span>
+        `;
+
+        document.querySelector("#workers").innerHTML += worker;
+      });
+    }
+  }
+
+  socket.on('showAllUsers', function (data) {
+    if (data[bugID] !== undefined) {
+
+      for (worker in data[bugID]) {
+        let user = { id: worker, email: data[bugID][worker] }
+
+        showUser(user);
+      }
+    }
+  })
+
+  socket.on('deleteUser', function (data) {
+    let id = data.id;
+    let email = data.email;
+
+    if (document.getElementById(id)) {
+      document.getElementById(id).remove();
+      document.querySelector(`.${id}`).remove();
+    }
+  })
+
+});
+

js/etersoft/timer.js

@@ -338,9 +338,13 @@ window.addEventListener("load", function() {
         document.querySelector("#productive_time").value = productiveTimeValue;
 
         // обновим оставшееся время
+<<<<<<< HEAD
         if (document.getElementById('estimated_time')) {
             updateRemainingTime(workTimeValue);
         }
+=======
+        updateRemainingTime(workTimeValue);
+>>>>>>> d2827f5de ([ref] Refactor js/etersoft/timer.js. #14950)
 
         // check comment before submit
         const comment = document.querySelector("#comment").value;

post_bug.cgi~

+#!/usr/bin/perl -T
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.10.1;
+use strict;
+use warnings;
+
+use lib qw(. lib);
+
+use Bugzilla;
+use Bugzilla::Attachment;
+use Bugzilla::BugMail;
+use Bugzilla::Constants;
+use Bugzilla::Util;
+use Bugzilla::Error;
+use Bugzilla::Bug;
+use Bugzilla::User;
+use Bugzilla::Hook;
+use Bugzilla::Token;
+use Bugzilla::Flag;
+
+use List::MoreUtils qw(uniq);
+
+my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+my $cgi      = Bugzilla->cgi;
+my $dbh      = Bugzilla->dbh;
+my $template = Bugzilla->template;
+my $vars     = {};
+
+######################################################################
+# Main Script
+######################################################################
+
+# redirect to enter_bug if no field is passed.
+unless ($cgi->param()) {
+  print $cgi->redirect(correct_urlbase() . 'enter_bug.cgi');
+  exit;
+}
+
+# Detect if the user already used the same form to submit a bug
+my $token = trim($cgi->param('token'));
+check_token_data($token, 'create_bug', 'index.cgi');
+
+# do a match on the fields if applicable
+Bugzilla::User::match_field({
+  'cc'          => {'type' => 'multi'},
+  'assigned_to' => {'type' => 'single'},
+  'qa_contact'  => {'type' => 'single'},
+});
+
+if (defined $cgi->param('maketemplate')) {
+  $vars->{'url'}        = $cgi->canonicalise_query('token');
+  $vars->{'short_desc'} = $cgi->param('short_desc');
+
+  print $cgi->header();
+  $template->process("bug/create/make-template.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
+}
+
+# The format of the initial comment can be structured by adding fields to the
+# enter_bug template and then referencing them in the comment template.
+my $comment;
+my $format
+  = $template->get_format("bug/create/comment", scalar($cgi->param('format')),
+  "txt");
+$template->process($format->{'template'}, $vars, \$comment)
+  || ThrowTemplateError($template->error());
+
+# Include custom fields editable on bug creation.
+my @custom_bug_fields
+  = grep { $_->type != FIELD_TYPE_MULTI_SELECT && $_->enter_bug }
+  Bugzilla->active_custom_fields;
+
+# Undefined custom fields are ignored to ensure they will get their default
+# value (e.g. "---" for custom single select fields).
+my @bug_fields = grep { defined $cgi->param($_->name) } @custom_bug_fields;
+@bug_fields = map { $_->name } @bug_fields;
+
+push(
+  @bug_fields, qw(
+    product
+    component
+
+    assigned_to
+    qa_contact
+
+    alias
+    blocked
+    comment_is_private
+    bug_file_loc
+    bug_severity
+    bug_status
+    dependson
+    keywords
+    short_desc
+    op_sys
+    priority
+    rep_platform
+    version
+    target_milestone
+    status_whiteboard
+    see_also
+    estimated_time
+    deadline
+    work_time
+    productive_time
+    )
+);
+my %bug_params;
+foreach my $field (@bug_fields) {
+  $bug_params{$field} = $cgi->param($field);
+}
+
+printf %bug_params;
+
+foreach my $field (qw(cc groups)) {
+  next if !$cgi->should_set($field);
+  $bug_params{$field} = [$cgi->param($field)];
+}
+$bug_params{'comment'} = $comment;
+
+my @multi_selects
+  = grep { $_->type == FIELD_TYPE_MULTI_SELECT && $_->enter_bug }
+  Bugzilla->active_custom_fields;
+
+foreach my $field (@multi_selects) {
+  next if !$cgi->should_set($field->name);
+  $bug_params{$field->name} = [$cgi->param($field->name)];
+}
+
+my $bug = Bugzilla::Bug->create(\%bug_params);
+
+# Get the bug ID back and delete the token used to create this bug.
+my $id = $bug->bug_id;
+delete_token($token);
+
+# We do this directly from the DB because $bug->creation_ts has the seconds
+# formatted out of it (which should be fixed some day).
+my $timestamp
+  = $dbh->selectrow_array('SELECT creation_ts FROM bugs WHERE bug_id = ?',
+  undef, $id);
+
+# Set Version cookie, but only if the user actually selected
+# a version on the page.
+if (defined $cgi->param('version')) {
+  $cgi->send_cookie(
+    -name    => "VERSION-" . $bug->product,
+    -value   => $bug->version,
+    -expires => "Fri, 01-Jan-2038 00:00:00 GMT"
+  );
+}
+
+# We don't have to check if the user can see the bug, because a user filing
+# a bug can always see it. You can't change reporter_accessible until
+# after the bug is filed.
+
+# Add an attachment if requested.
+my $data_fh     = $cgi->upload('data');
+my $attach_text = $cgi->param('attach_text');
+
+if ($data_fh || $attach_text) {
+  $cgi->param('isprivate', $cgi->param('comment_is_private'));
+
+  # Must be called before create() as it may alter $cgi->param('ispatch').
+  my $content_type = Bugzilla::Attachment::get_content_type();
+  my $attachment;
+
+  # If the attachment cannot be successfully added to the bug,
+  # we notify the user, but we don't interrupt the bug creation process.
+  my $error_mode_cache = Bugzilla->error_mode;
+  Bugzilla->error_mode(ERROR_MODE_DIE);
+  eval {
+    $attachment = Bugzilla::Attachment->create({
+      bug         => $bug,
+      creation_ts => $timestamp,
+      data        => $attach_text || $data_fh,
+      description => scalar $cgi->param('description'),
+      filename    => $attach_text ? "file_$id.txt" : $data_fh,
+      ispatch     => scalar $cgi->param('ispatch'),
+      isprivate   => scalar $cgi->param('isprivate'),
+      mimetype    => $content_type,
+    });
+  };
+  Bugzilla->error_mode($error_mode_cache);
+
+  if ($attachment) {
+
+    # Set attachment flags.
+    my ($flags, $new_flags)
+      = Bugzilla::Flag->extract_flags_from_cgi($bug, $attachment, $vars,
+      SKIP_REQUESTEE_ON_ERROR);
+    $attachment->set_flags($flags, $new_flags);
+    $attachment->update($timestamp);
+    my $comment = $bug->comments->[0];
+    $comment->set_all(
+      {type => CMT_ATTACHMENT_CREATED, extra_data => $attachment->id});
+    $comment->update();
+  }
+  else {
+    $vars->{'message'} = 'attachment_creation_failed';
+  }
+}
+
+# Set bug flags.
+my ($flags, $new_flags)
+  = Bugzilla::Flag->extract_flags_from_cgi($bug, undef, $vars,
+  SKIP_REQUESTEE_ON_ERROR);
+$bug->set_flags($flags, $new_flags);
+$bug->update($timestamp);
+
+$vars->{'id'}  = $id;
+$vars->{'bug'} = $bug;
+
+Bugzilla::Hook::process('post_bug_after_creation', {vars => $vars});
+
+my $recipients = {changer => $user};
+my $bug_sent   = Bugzilla::BugMail::Send($id, $recipients);
+$bug_sent->{type} = 'created';
+$bug_sent->{id}   = $id;
+my @all_mail_results = ($bug_sent);
+
+foreach my $dep (@{$bug->dependson || []}, @{$bug->blocked || []}) {
+  my $dep_sent = Bugzilla::BugMail::Send($dep, $recipients);
+  $dep_sent->{type} = 'dep';
+  $dep_sent->{id}   = $dep;
+  push(@all_mail_results, $dep_sent);
+}
+
+# Sending emails for any referenced bugs.
+foreach my $ref_bug_id (uniq @{$bug->{see_also_changes} || []}) {
+  my $ref_sent = Bugzilla::BugMail::Send($ref_bug_id, $recipients);
+  $ref_sent->{id} = $ref_bug_id;
+  push(@all_mail_results, $ref_sent);
+}
+
+$vars->{sentmail} = \@all_mail_results;
+
+$format = $template->get_format("bug/create/created",
+  scalar($cgi->param('created-format')), "html");
+print $cgi->header();
+$template->process($format->{'template'}, $vars)
+  || ThrowTemplateError($template->error());
+
+1;

Mozilla-Dark @ 2c2d37f0

+Subproject commit 2c2d37f03fbfd96094e2c19cfe14413745411b72

template/en/default/etersoft/bugswatcher.html.tmpl~

+<tr><th class="field_label bugs-watcher">In work:</th><td class="field-value" id="workers"></td></tr>
+<div style="display: none;" id="useremail" class="[% user.email FILTER html %]"></div>
+<link rel="stylesheet" type="text/css" href="/js/etersoft/bugs-watcher.css" />
+<script language="javascript" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.3.0/socket.io.js"></script>
+<script language="javascript" type="text/javascript" src="/js/etersoft/bugsWatcher.js?29_07_2020"></script>
+

template/en/default/etersoft/timersplash.html.tmpl

@@ -46,4 +46,8 @@
 
 <script language="javascript" type="text/javascript" src="js/etersoft/focusManager.js"></script>
 <script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js?25_10_2017"></script>
+<<<<<<< HEAD
 <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script>
+=======
+<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
+>>>>>>> d2827f5de ([ref] Refactor js/etersoft/timer.js. #14950)

template/en/default/etersoft/timersplash.html.tmpl~

+<link rel="stylesheet" type="text/css" href="js/etersoft/timersplash.css?15_04_2020" />
+
+<div style="display: none;" id="useremail" class="[% user.email FILTER html %]"></div>
+<div style="display: none;" id="assigntoemail" class="[% bug.assigned_to.email FILTER html %]"></div>
+
+<!-- Таймер -->
+<div id="timerblock" title="Время на странице">
+  <img src="js/etersoft/control_pause.gif" id="timer_pause" onclick="timer.togglePause()" title="Пауза" />
+  <img src="js/etersoft/control_right.gif" id="timer_play" onclick="timer.togglePause()" title="Продолжить" />
+  <img src="js/etersoft/control_stop.gif" id="timer_stop" onclick="if (confirm('Вы точно хотите сбросить таймер?')) {timer.reset();}" title="Сбросить таймер" />
+  <input type="text" size="10" title="Время на странице" id='timespent' name="timespent" value="" readonly="readonly">
+</div>
+
+<!-- Сохранение времени -->
+<div id="timeQuestionDiv">
+<div class="container">
+<div class="workTime">
+    <h3>Укажите отработанное время</h3>
+    <fieldset>
+      Отработанное время:
+      <div class="workTimeInner">
+        <input class="workTime__input" id="realworktime" name="realworktime" data-time="" placeholder="в минутах" title="Общее время, потраченное на задачу." type="text" tabindex="1" required autofocus>
+        <button class="workTime__button" data-time="1" onclick="document.querySelector('#realworktime').value=this.dataset['time']" tabindex="2">1</button>
+        <button class="workTime__button" data-time="5" onclick="document.querySelector('#realworktime').value=this.dataset['time']" tabindex="3">5</button>
+        <button class="workTime__button" data-time="15" onclick="document.querySelector('#realworktime').value=this.dataset['time']" tabindex="4">15</button>
+        <button class="workTime__button" data-time="30" onclick="document.querySelector('#realworktime').value=this.dataset['time']" tabindex="5">30</button>
+      </div>
+    </fieldset>
+    <fieldset>
+      Продуктивное время:
+      <div class="workTimeInner">
+        <input class="workTime__input" id="ProductTime" placeholder="в минутах" title="Время, которое вы бы потратили на задачу, зная как её решать." type="text" tabindex="6" required>
+        <button class="workTime__button" data-time="1" onclick="document.querySelector('#ProductTime').value=this.dataset['time']" tabindex="7">1</button>
+        <button class="workTime__button" data-time="5" onclick="document.querySelector('#ProductTime').value=this.dataset['time']" tabindex="8">5</button>
+        <button class="workTime__button" data-time="15" onclick="document.querySelector('#ProductTime').value=this.dataset['time']" tabindex="9">15</button>
+        <button class="workTime__button" data-time="30" onclick="document.querySelector('#ProductTime').value=this.dataset['time']" tabindex="10">30</button>
+      </div>
+    </fieldset>
+    <fieldset>
+      <button class="workTime__button--save" id="saveTime" tabindex="11">Сохранить</button>
+    </fieldset>
+    <button onclick="closeDiv();" class="close" tabindex="12">&times;</button>
+  </div>
+</div>
+</div>
+
+<script language="javascript" type="text/javascript" src="js/etersoft/focusManager.js"></script>
+<script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js?25_10_2017"></script>
+<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020_"></script>

template/ru/default/etersoft/bugswatcher.html.tmpl~

+<tr><th class="field_label bugs-watcher">В работе у:</th><td class="field-value" id="workers"></td></tr>
+<div style="display: none;" id="useremail" class="[% user.email FILTER html %]"></div>
+<link rel="stylesheet" type="text/css" href="/js/etersoft/bugs-watcher.css" />
+<script language="javascript" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.3.0/socket.io.js"></script>
+<script language="javascript" type="text/javascript" src="/js/etersoft/bugsWatcher.js?28_07_2020"></script>
+

template/ru/default/etersoft/timersplash.html.tmpl

@@ -46,4 +46,8 @@
 
 <script language="javascript" type="text/javascript" src="js/etersoft/focusManager.js"></script>
 <script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js?25_10_2017"></script>
+<<<<<<< HEAD
 <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script>
+=======
+<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
+>>>>>>> d2827f5de ([ref] Refactor js/etersoft/timer.js. #14950)

template/ru/default/etersoft/timersplash.html.tmpl~

+<link rel="stylesheet" type="text/css" href="js/etersoft/timersplash.css?15_04_2020" />
+
+<div style="display: none;" id="useremail" class="[% user.email FILTER html %]"></div>
+<div style="display: none;" id="assigntoemail" class="[% bug.assigned_to.email FILTER html %]"></div>
+
+<!-- Таймер -->
+<div id="timerblock" title="Время на странице">
+  <img src="js/etersoft/control_pause.gif" id="timer_pause" onclick="timer.togglePause()" title="Пауза" />
+  <img src="js/etersoft/control_right.gif" id="timer_play" onclick="timer.togglePause()" title="Продолжить" />
+  <img src="js/etersoft/control_stop.gif" id="timer_stop" onclick="if (confirm('Вы точно хотите сбросить таймер?')) {timer.reset();}" title="Сбросить таймер" />
+  <input type="text" size="10" title="Время на странице" id='timespent' name="timespent" value="" readonly="readonly">
+</div>
+
+<!-- Сохранение времени -->
+<div id="timeQuestionDiv">
+<div class="container">
+<div class="workTime">
+    <h3>Укажите отработанное время</h3>
+    <fieldset>
+      Отработанное время:
+      <div class="workTimeInner">
+        <input class="workTime__input" id="realworktime" name="realworktime" data-time="" placeholder="в минутах" title="Общее время, потраченное на задачу." type="text" tabindex="1" required>
+        <button class="workTime__button" data-time="1" onclick="document.querySelector('#realworktime').value=this.dataset['time']" tabindex="2">1</button>
+        <button class="workTime__button" data-time="5" onclick="document.querySelector('#realworktime').value=this.dataset['time']" tabindex="3">5</button>
+        <button class="workTime__button" data-time="15" onclick="document.querySelector('#realworktime').value=this.dataset['time']" tabindex="4">15</button>
+        <button class="workTime__button" data-time="30" onclick="document.querySelector('#realworktime').value=this.dataset['time']" tabindex="5">30</button>
+      </div>
+    </fieldset>
+    <fieldset>
+      Продуктивное время:
+      <div class="workTimeInner">
+        <input class="workTime__input" id="ProductTime" placeholder="в минутах" title="Время, которое вы бы потратили на задачу, зная как её решать." type="text" tabindex="6" required>
+	<button class="workTime__button" data-time="1" onclick="document.querySelector('#ProductTime').value=this.dataset['time']" tabindex="7">1</button>
+	<button class="workTime__button" data-time="5" onclick="document.querySelector('#ProductTime').value=this.dataset['time']" tabindex="8">5</button>
+	<button class="workTime__button" data-time="15" onclick="document.querySelector('#ProductTime').value=this.dataset['time']" tabindex="9">15</button>
+	<button class="workTime__button" data-time="30" onclick="document.querySelector('#ProductTime').value=this.dataset['time']" tabindex="10">30</button>
+      </div>
+    </fieldset>
+    <fieldset>
+      <button class="workTime__button--save" id="saveTime" tabindex="11">Сохранить</button>
+    </fieldset>
+    <button onclick="closeDiv();" class="close" tabindex="12">&times;</button>
+  </div>
+</div>
+</div>
+
+<script language="javascript" type="text/javascript" src="js/etersoft/focusManager.js"></script>
+<script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js?25_10_2017"></script>
+<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020_"></script>