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.

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

#591 - Show 2.0 features for server versions >= 9 #646

Merged
merged 2 commits into from
Mar 7, 2018

Conversation

wooldridge
Copy link
Contributor

This includes "Entities" link in header and "Code Generation" section in Create Flow dialog.
Check for version !== 8 rather than == 9.

Fixes marklogic/datahub-central#1130

This includes "Entities" link in header and "Code Generation" section in Create Flow dialog.
Check for version !== 8 rather than == 9.
@marklogic-builder
Copy link

Can one of the admins verify this patch?

1 similar comment
@marklogic-builder
Copy link

Can one of the admins verify this patch?

@wooldridge wooldridge changed the title Show 2.0 features for server versions >= 9 #591 - Show 2.0 features for server versions >= 9 Jan 12, 2018
@popzip
Copy link
Contributor

popzip commented Jan 12, 2018

">=9" (ie not 7)

@@ -12,7 +12,7 @@
<div class="mdl-layout-spacer"></div>
<nav class="mdl-navigation mdl-layout--large-screen-only">
<a id="database-tab" class="mdl-navigation__link" [ngClass]="{'active': isActive('/')}" [routerLink]="['']"><i class="fa fa-dashboard"></i> Dashboard</a>
<a id="entities-tab" class="mdl-navigation__link" *ngIf="getMarkLogicVersion().startsWith('9')" [ngClass]="{'active': isActive('/entities')}" [routerLink]="['entities']"><i class="fa fa-industry"></i> Entities</a>
<a id="entities-tab" class="mdl-navigation__link" *ngIf="!getMarkLogicVersion().startsWith('8')" [ngClass]="{'active': isActive('/entities')}" [routerLink]="['entities']"><i class="fa fa-industry"></i> Entities</a>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with @popzip that we should be >= to 9, not just looking for 'not 8' for completeness of version checking.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aebadirad, can you tell me what ML version formats I can expect from the /api/current-project endpoint? I know that value looks like "10.0-20180115" on my local build but I'm not sure how/if it varies with other distributions.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think to get the major version you can always get the value before the first period and parse and an integer.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aebadirad I addressed the review comments with 05407a3. Can we merge this?

@marklogic-builder
Copy link

Jenkins Build successful
http://jenkins.marklogic.com/job/Labs/job/DHF_b9_nightly_linux_cluster/10
509 tests run, 0 skipped, 0 failed.

@aebadirad aebadirad merged commit fda672e into Marklogic-retired:develop Mar 7, 2018
@wooldridge wooldridge deleted the ui-version-check branch May 11, 2018 23:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants