[ARVADOS] updated: 32b97aec0d210ec7a951f441cc6a44b4d0921a90
git at public.curoverse.com
git at public.curoverse.com
Fri Sep 12 13:23:19 EDT 2014
Summary of changes:
apps/workbench/app/models/job.rb | 10 +++++++++-
apps/workbench/app/models/pipeline_instance.rb | 6 +++++-
apps/workbench/app/models/pipeline_template.rb | 4 ++++
.../application/_name_and_description.html.erb | 12 ++++++++++++
apps/workbench/app/views/application/show.html.erb | 3 +++
.../app/views/pipeline_instances/show.html.erb | 22 +++++++++++++---------
apps/workbench/app/views/projects/show.html.erb | 10 +---------
sdk/cli/bin/arv-run-pipeline-instance | 11 ++++++++++-
sdk/cli/bin/crunch-job | 6 ++++++
services/api/app/models/job_task.rb | 2 ++
services/api/app/models/pipeline_instance.rb | 2 ++
...add_start_finish_time_to_tasks_and_pipelines.rb | 15 +++++++++++++++
services/api/db/structure.sql | 10 ++++++++--
13 files changed, 90 insertions(+), 23 deletions(-)
create mode 100644 apps/workbench/app/views/application/_name_and_description.html.erb
create mode 100644 services/api/db/migrate/20140909183946_add_start_finish_time_to_tasks_and_pipelines.rb
via 32b97aec0d210ec7a951f441cc6a44b4d0921a90 (commit)
via a31f94b1b433964c1481c384f2989392321d5529 (commit)
via ac594f16176901b7692be354045226e093b14218 (commit)
via 00a0690c32f29f7d2c1b6030dd01578d98ea6dd6 (commit)
via 35bf7a16482b304908c5b6bf3cd772647158f593 (commit)
via e7973cab8f9fc9531e4d928e73928e6eab022f48 (commit)
via 655d5ae89e941c8b11bd4ba795e9ef2168463881 (commit)
via e5ab4ce19d5ace5e6dd5cd32c23f50b35d20c8ef (commit)
from 0cf2f356035164cd92e4a5722f0dd25c7502164e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 32b97aec0d210ec7a951f441cc6a44b4d0921a90
Merge: a31f94b ac594f1
Author: radhika <radhika at curoverse.com>
Date: Fri Sep 12 13:23:06 2014 -0400
Merge branch 'master' into 2875-pipeline-description
Conflicts:
services/api/app/models/pipeline_instance.rb
services/api/db/structure.sql
diff --cc services/api/app/models/pipeline_instance.rb
index 9f7a67c,7523918..28345d5
--- a/services/api/app/models/pipeline_instance.rb
+++ b/services/api/app/models/pipeline_instance.rb
@@@ -22,7 -22,8 +22,9 @@@ class PipelineInstance < ArvadosMode
t.add :properties
t.add :state
t.add :components_summary
+ t.add :description
+ t.add :started_at
+ t.add :finished_at
end
# Supported states for a pipeline instance
diff --cc services/api/db/structure.sql
index 5bb08de,2168739..af97f67
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -2024,4 -2017,4 +2028,6 @@@ INSERT INTO schema_migrations (version
INSERT INTO schema_migrations (version) VALUES ('20140828141043');
-INSERT INTO schema_migrations (version) VALUES ('20140909183946');
++INSERT INTO schema_migrations (version) VALUES ('20140909183946');
++
+INSERT INTO schema_migrations (version) VALUES ('20140911221252');
commit a31f94b1b433964c1481c384f2989392321d5529
Author: radhika <radhika at curoverse.com>
Date: Fri Sep 12 13:17:14 2014 -0400
2875: add new partial to display name and description.
diff --git a/apps/workbench/app/models/job.rb b/apps/workbench/app/models/job.rb
index aac6168..9e9c096 100644
--- a/apps/workbench/app/models/job.rb
+++ b/apps/workbench/app/models/job.rb
@@ -8,7 +8,11 @@ class Job < ArvadosBase
end
def attribute_editable? attr, *args
- false
+ if attr.to_sym == :description
+ super && attr.to_sym == :description
+ else
+ false
+ end
end
def self.creatable?
@@ -33,4 +37,8 @@ class Job < ArvadosBase
def cancel
arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {}
end
+
+ def textile_attributes
+ [ 'description' ]
+ end
end
diff --git a/apps/workbench/app/models/pipeline_instance.rb b/apps/workbench/app/models/pipeline_instance.rb
index e334846..89acbb0 100644
--- a/apps/workbench/app/models/pipeline_instance.rb
+++ b/apps/workbench/app/models/pipeline_instance.rb
@@ -44,7 +44,7 @@ class PipelineInstance < ArvadosBase
end
def attribute_editable? attr, *args
- super && (attr.to_sym == :name ||
+ super && (attr.to_sym == :name || attr.to_sym == :description ||
(attr.to_sym == :components and
(self.state == 'New' || self.state == 'Ready')))
end
@@ -67,4 +67,8 @@ class PipelineInstance < ArvadosBase
"\"#{input_name.to_s}\" parameter for #{component[:script]} script in #{component_name} component"
end
end
+
+ def textile_attributes
+ [ 'description' ]
+ end
end
diff --git a/apps/workbench/app/models/pipeline_template.rb b/apps/workbench/app/models/pipeline_template.rb
index e1af2cb..6e79775 100644
--- a/apps/workbench/app/models/pipeline_template.rb
+++ b/apps/workbench/app/models/pipeline_template.rb
@@ -6,4 +6,8 @@ class PipelineTemplate < ArvadosBase
def self.creatable?
false
end
+
+ def textile_attributes
+ [ 'description' ]
+ end
end
diff --git a/apps/workbench/app/views/application/_name_and_description.html.erb b/apps/workbench/app/views/application/_name_and_description.html.erb
new file mode 100644
index 0000000..0144a4d
--- /dev/null
+++ b/apps/workbench/app/views/application/_name_and_description.html.erb
@@ -0,0 +1,12 @@
+<% if @object.respond_to? :name %>
+ <h2>
+ <%= render_editable_attribute @object, 'name', nil, { 'data-emptytext' => "New #{controller.model_class.to_s.underscore.gsub("_"," ")}" } %>
+ </h2>
+<% end %>
+
+<% if @object.respond_to? :description %>
+ <div class="arv-description-as-subtitle">
+ <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual' } %>
+ </div>
+<% end %>
+
diff --git a/apps/workbench/app/views/application/show.html.erb b/apps/workbench/app/views/application/show.html.erb
index 490e7e4..d4b1785 100644
--- a/apps/workbench/app/views/application/show.html.erb
+++ b/apps/workbench/app/views/application/show.html.erb
@@ -5,6 +5,9 @@
<% end %>
<% content_for :content_top do %>
+ <% if !['Group','User'].include? @object.class.to_s # not a project %>
+ <%= render partial: 'name_and_description' %>
+ <% end %>
<% if @object.respond_to? :properties and !@object.properties.nil? %>
<% if @object.properties[:page_content] %>
diff --git a/apps/workbench/app/views/pipeline_instances/show.html.erb b/apps/workbench/app/views/pipeline_instances/show.html.erb
index b30db3b..36d905e 100644
--- a/apps/workbench/app/views/pipeline_instances/show.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/show.html.erb
@@ -1,14 +1,18 @@
<% template = PipelineTemplate.find?(@object.pipeline_template_uuid) %>
<%= content_for :content_top do %>
- <h2>
- <%= render_editable_attribute @object, 'name', nil %>
- </h2>
- <% if template %>
- <blockquote><span class="deemphasize">From template:</span><br />
- <%= link_to_if_arvados_object template, friendly_name: true %><br />
- <%= template.description %>
- </blockquote>
- <% end %>
+ <div class="row">
+ <div class="col-sm-6">
+ <%= render partial: 'name_and_description' %>
+ </div>
+ <% if template %>
+ <div class="alert alert-info col-sm-6">
+ This pipeline has been created from the template <%= link_to_if_arvados_object template, friendly_name: true %><br />
+ <% if template.modified_at && (template.modified_at > @object.created_at) %>
+ Note: This template has been modified since this instance was created.
+ <% end %>
+ </div>
+ <% end %>
+ </div>
<% end %>
<% content_for :tab_line_buttons do %>
diff --git a/apps/workbench/app/views/projects/show.html.erb b/apps/workbench/app/views/projects/show.html.erb
index 2551760..a0ae2d3 100644
--- a/apps/workbench/app/views/projects/show.html.erb
+++ b/apps/workbench/app/views/projects/show.html.erb
@@ -1,14 +1,6 @@
<% if @object.uuid != current_user.uuid # Not the "Home" project %>
<% content_for :content_top do %>
-
-<h2>
- <%= render_editable_attribute @object, 'name', nil, { 'data-emptytext' => "New project" } %>
-</h2>
-
-<div class="arv-description-as-subtitle">
- <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual' } %>
-</div>
-
+ <%= render partial: 'name_and_description' %>
<% end %>
<% end %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list