Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/tao 9386/field and role #250

Merged
merged 2 commits into from
Oct 23, 2019
Merged

Fix/tao 9386/field and role #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6e9352
Fixed fields
tikhanovichA Oct 23, 2019
c0389e0
Bump version
tikhanovichA Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions controller/CompatibilityChecker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')));
}
Expand Down
2 changes: 1 addition & 1 deletion manifest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion scripts/update/Updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
}
2 changes: 1 addition & 1 deletion views/js/tools/diagnostic/diagnostic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ define([
}

if (this.config.requireSchoolId) {
manageSchoolProperties(['school_id']);
manageSchoolProperties(['school_id', 'workstation']);
}

// show result details
Expand Down
4 changes: 4 additions & 0 deletions views/js/tools/diagnostic/tpl/main.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down