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

Remove base path and make public. #1630

Merged
merged 3 commits into from
Mar 14, 2017
Merged

Remove base path and make public. #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da85e74
Remove base path and make public.
jkmarx Mar 13, 2017
f5935bb
Remove formData additional for public and base Path.
jkmarx Mar 13, 2017
62405f4
Merge branch 'develop' of https://github.com/refinery-platform/refine…
jkmarx Mar 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions refinery/ui/source/js/data-set-import/controllers/metadata-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,6 @@ MetadataTableImportCtrl.prototype.startImport = function () {
if (self.speciesColumn) {
formData.append('species_column', self.speciesColumn);
}
if (self.basePath) {
formData.append('base_path', self.basePath);
}
if (self.annotationColumn) {
formData.append('annotation_column', self.annotationColumn);
}
Expand All @@ -310,9 +307,6 @@ MetadataTableImportCtrl.prototype.startImport = function () {
if (self.dataFilePermanent) {
formData.append('data_file_permanent', self.dataFilePermanent);
}
if (self.makePublic) {
formData.append('is_public', self.makePublic);
}

return this.tabularFileImportApi
.create({}, formData)
Expand Down
34 changes: 0 additions & 34 deletions refinery/ui/source/js/data-set-import/partials/metadata-table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,24 +336,6 @@ <h4>Publishing</h4>
</div>
</div>

<div class="row m-t-1-4 m-b-1-4">
<div class="col-sm-6 col-md-3 col-lg-2">
Make Public
</div>
<div class="col-sm-6 col-md-3 col-lg-2">
<input
type="checkbox"
name="is_public"
ng-model="metadataTable.makePublic"/>
</div>
<div class="col-sm-12 col-md-6 col-lg-8">
If selected, the data set will be made publicly
viewable when the import has completed.
<br>Use this feature with care.</br>
</div>
</div>
</div>

<div>
<div class="refinery-subheader m-t-1">
<div
Expand Down Expand Up @@ -399,22 +381,6 @@ <h4>Advanced</h4>
</div>
</div>

<div class="row m-t-1-4 m-b-1-4">
<div class="col-sm-6 col-md-3 col-lg-2">
Base Path
</div>
<div class="col-sm-6 col-md-3 col-lg-2">
<input
type="text"
class="width-95"
name="base_path"
ng-model="metadataTable.basePath">
</div>
<div class="col-sm-12 col-md-6 col-lg-8">
Base path of your data file paths if using relative locations.
</div>
</div>

<div class="row m-t-1-4 m-b-1-4">
<div class="col-sm-6 col-md-3 col-lg-2">
Annotation Column
Expand Down