Merge pull request #250 from oat-sa/fix/TAO-9386/field-and-role

Fix/tao 9386/field and role
oat-sa · Oct 23, 2019 · b4fcde2 · b4fcde2
2 parents 29c8459 + c0389e0
commit b4fcde2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/controller/CompatibilityChecker.php b/controller/CompatibilityChecker.php
@@ -248,6 +248,10 @@ protected function getData($check = false)
             $data[Storage::DIAGNOSTIC_SCHOOL_ID] = \tao_helpers_Display::sanitizeXssHtml(trim($this->getRequestParameter('school_id')));
         }
 
+        if ($this->hasRequestParameter('workstation')) {
+            $data[Storage::DIAGNOSTIC_WORKSTATION] = \tao_helpers_Display::sanitizeXssHtml(trim($this->getRequestParameter('workstation')));
+        }
+
         if ($this->hasRequestParameter('school_number')) {
             $data[Storage::DIAGNOSTIC_SCHOOL_NUMBER] = \tao_helpers_Display::sanitizeXssHtml(trim($this->getRequestParameter('school_number')));
         }

diff --git a/manifest.php b/manifest.php
@@ -30,7 +30,7 @@
     'label'       => 'Browser and OS diagnostic tool',
     'description' => 'Check compatibility of the os and browser of a client',
     'license'     => 'GPL-2.0',
-    'version'     => '7.2.1',
+    'version'     => '7.2.2',
     'author'      => 'Open Assessment Technologies SA',
     'requires'    => array(
         'generis'    => '>=12.5.0',

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -815,6 +815,6 @@ public function update($initialVersion)
             $this->setVersion('7.2.0');
         }
 
-        $this->skip('7.2.0', '7.2.1');
+        $this->skip('7.2.0', '7.2.2');
     }
 }
diff --git a/views/js/tools/diagnostic/diagnostic.js b/views/js/tools/diagnostic/diagnostic.js
@@ -716,7 +716,7 @@ define([
                 }
 
                 if (this.config.requireSchoolId) {
-                    manageSchoolProperties(['school_id']);
+                    manageSchoolProperties(['school_id', 'workstation']);
                 }
 
                 // show result details

diff --git a/views/js/tools/diagnostic/tpl/main.tpl b/views/js/tools/diagnostic/tpl/main.tpl
@@ -11,6 +11,10 @@
             <label for="school_id">{{__ "School ID:"}}</label>
             <input type="text" data-control="school_id" id="school_id" name="school_id" maxlength="255" placeholder="{{__ "School ID"}}" />
         </p>
+        <p>
+            <label for="workstation">{{__ "Workstation:"}}</label>
+            <input type="text" data-control="workstation" id="workstation" name="workstation" maxlength="64" placeholder="{{__ "Workstation name"}}" />
+        </p>
         {{/if}}
         {{#if requireSchoolName}}
             {{#if validateSchoolName}}