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

Mccalluc/details tab #2060

Merged
merged 3 commits into from Aug 28, 2017
Merged

Mccalluc/details tab #2060

merged 3 commits into from Aug 28, 2017

Conversation

mccalluc
Copy link
Member

@mccalluc mccalluc commented Aug 28, 2017

Towards #1890.

Two questions about the old one, copied from the thread there:

Missing None:None under STUDIES

This does not come through because in the source code we have

  <span ng-if="study.identifier">
    <strong>{{study.identifier}}</strong>
  </span>
  <span ng-if="study.title">
    : {{study.title}}
  </span>

... which seems more like a feature than a bug?

Also: New one is missing creation date of the current version: Should that also be ported from the old version?

Import into Own Space might be more complicated, but this much could be merged, I think.

original:
screen shot 2017-07-10 at 5 14 02 pm

with this pr:
screen shot 2017-08-28 at 3 05 09 pm

Copy link
Member

@scottx611x scottx611x left a comment

Choose a reason for hiding this comment

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

Looks good to me, check out

{% if isatab_archive and data_set.is_public and data_set.get_owner_username != user.username and user.id %}
<form id="isaTabImportForm" enctype="multipart/form-data" action="{% url "take_ownership_of_public_dataset" %}" method="post">
{% csrf_token %}
<p>
<input id="id_isa_tab_url" type="hidden" name="isa_tab_url" value="{{ isatab_archive.get_datafile_url }}" />
</p>
<input class="refinery-base btn btn-important"
id="isa-import-button" type="submit" value="Import into own Space"/>
<div style="padding: 15px; display: block; height: 22px; width: 22px;" id="isa-spinner"></div>
</form>
{% endif %}
for Import into own space code

@mccalluc mccalluc merged commit 218256e into develop Aug 28, 2017
@mccalluc mccalluc deleted the mccalluc/details-tab branch August 28, 2017 19:18
@mccalluc
Copy link
Member Author

@scottx611x : Thanks: If you have thoughts on the two questions at the top, let me know?

@codecov-io
Copy link

Codecov Report

Merging #2060 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #2060   +/-   ##
========================================
  Coverage    44.22%   44.22%           
========================================
  Files          417      417           
  Lines        27729    27729           
  Branches      1340     1340           
========================================
  Hits         12263    12263           
  Misses       15466    15466

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b28b996...854eb4f. Read the comment docs.

@scottx611x
Copy link
Member

@mccalluc regarding the None:None i'm not sure if we want to remove the ng-ifs to keep consistent with the functionality that we had before? It seems odd to me to explicitly state the Nones, though

As for the creation date of the newest version I think that would be great to include.

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.

None yet

3 participants