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

Jump to bottom

update roadmap url #1031

Merged
merged 1 commit into from
Sep 10, 2019
Merged

update roadmap url #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion classes/OpenXdmod/Migration/Version812To850/ConfigFilesMigration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,14 @@ public function execute()
'data_warehouse_export_export_directory' => '/var/spool/xdmod/export',
'data_warehouse_export_retention_duration_days' => 30
]);

$data = parse_ini_file($this->portalSettingsPath, true);
$roadmapUrl = 'https://trello.com/embed/board?id=mdFESh6j';
if('https://trello.com/b/mdFESh6j.html' !== $data['roadmap']['url']){
$roadmapUrl = $data['roadmap']['url'];
}
$this->writePortalSettingsFile(array_merge(
['features_user_dashboard' => $dashboard],
['roadmap_url' => $roadmapUrl],
$exportSettings
));
}
Expand Down
2 changes: 1 addition & 1 deletion configuration/portal_settings.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ dw_desc_cache = "off"

; Settings that control the "Roadmap" action on the "About" tab.
[roadmap]
url = "https://trello.com/b/mdFESh6j.html"
url = "https://trello.com/embed/board?id=mdFESh6j"
header = "Located below is the XDMoD Development roadmap, organized by XDMoD release and powered by Trello.com. To view the full roadmap as well as vote and comment on features click any one of the elements on the roadmap. This will take you to the full roadmap on the Trello.com site in a new browser window (or tab). All users will be able to view the roadmap, however if you wish to vote or comment on a feature you will need to create a (free) Trello account if you do not already have one."

[rest]
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/test/specs/xdmod/about.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('About', function about() {
it('SUPReMM', function checkNavEntrySUPReMM() {
Abt.checkTab('SUPReMM');
});
it.skip('Roadmap', function checkNavEntryXDMoD() {
it('Roadmap', function checkNavEntryXDMoD() {
Abt.checkRoadmap();
});
it('Team', function checkNavEntryXDMoD() {
Expand Down Expand Up @@ -73,7 +73,7 @@ describe('About', function about() {
it('SUPReMM', function checkNavEntrySUPReMM() {
Abt.checkTab('SUPReMM');
});
it.skip('Roadmap', function checkNavEntryXDMoD() {
it('Roadmap', function checkNavEntryXDMoD() {
Abt.checkRoadmap();
});
it('Team', function checkNavEntryXDMoD() {
Expand Down
3 changes: 1 addition & 2 deletions tests/ui/test/specs/xdmod/about.page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ class About {
expect(err).to.be.a('undefined');
expect(result).to.not.be.a('null');
});
browser.waitForExist('.trello-lists', 30000);
browser.waitForText('.trello-lists', 30000);
browser.waitForExist('.board-tile-container', 30000);
browser.frameParent();
}

Expand Down