rename Project to Group

diff --git a/app/assets/javascripts/projects.js.coffee b/app/assets/javascripts/groups.js.coffee
similarity index 100%
rename from app/assets/javascripts/projects.js.coffee
rename to app/assets/javascripts/groups.js.coffee

diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/groups.css.scss
similarity index 63%
rename from app/assets/stylesheets/projects.css.scss
rename to app/assets/stylesheets/groups.css.scss
index 7b9c6ec3962bc303dc9c113449782bc7cf3c05ed..679563657b554e17f8d3332641df4e06bcd4ce6c 100644 (file)
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/groups.css.scss
@@ -1,3 +1,3 @@
-// Place all the styles related to the Projects controller here.
+// Place all the styles related to the Groups controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/

diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index 7b1ea6de9d12c3de00a1c50087f3aad2f252241a..4ca9212959cbd781dd3778f73fe11ae903919fbc 100644 (file)
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -36,8 +36,8 @@ class CollectionsController < ApplicationController
       if l.tail_kind == 'orvos#collection'
         c = (@collection_info[l.tail_uuid] ||= {uuid: l.tail_uuid})
         if l.link_class == 'group' and l.name == 'member_of'
-          c[:projects] ||= {}
-          c[:projects][l.tail_uuid] = true
+          c[:groups] ||= {}
+          c[:groups][l.tail_uuid] = true
         end
         if l.link_class == 'data_origin'
           c[:origin] = l

diff --git a/app/controllers/projects_controller.rb b/app/controllers/groups_controller.rb
similarity index 50%
rename from app/controllers/projects_controller.rb
rename to app/controllers/groups_controller.rb
index bd290c4e2b28f43f2394f210c077285532dfa5ba..4dc56c4a86fcb8126fb16380d6c3bb8cc8eba35d 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -1,3 +1,3 @@
-class ProjectsController < ApplicationController
+class GroupsController < ApplicationController
   before_filter :ensure_current_user_is_admin
 end

diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
new file mode 100644 (file)
index 0000000..c091b2f
--- /dev/null
+++ b/app/helpers/groups_helper.rb
@@ -0,0 +1,2 @@
+module GroupsHelper
+end

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
deleted file mode 100644 (file)
index db5c5ce..0000000
--- a/app/helpers/projects_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module ProjectsHelper
-end

diff --git a/app/helpers/vcf_pipeline_helper.rb b/app/helpers/vcf_pipeline_helper.rb
index 02d837f599bceab0f3df77e9f5f0b48303c4d1d1..9a27a4be1bb46ef8afbe885958e37d379c8bbb33 100644 (file)
--- a/app/helpers/vcf_pipeline_helper.rb
+++ b/app/helpers/vcf_pipeline_helper.rb
@@ -43,10 +43,10 @@ module VcfPipelineHelper
     end
     if stats[:collection_uuid]
       Link.where(tail_uuid: stats[:collection_uuid],
-                 head_kind: Project)[0..0].each do |c2p|
+                 head_kind: Group)[0..0].each do |c2p|
         stats[:project_uuid] = c2p.head_uuid
-        project = Project.find stats[:project_uuid]
-        stats[:project_name] = project.name rescue nil
+        group = Group.find stats[:project_uuid]
+        stats[:project_name] = group.name rescue nil
       end
       Link.where(tail_uuid: stats[:collection_uuid],
                  head_kind: Specimen)[0..0].each do |c2s|

diff --git a/app/models/group.rb b/app/models/group.rb
new file mode 100644 (file)
index 0000000..2a500a5
--- /dev/null
+++ b/app/models/group.rb
@@ -0,0 +1,2 @@
+class Group < OrvosBase
+end

diff --git a/app/models/orvos_base.rb b/app/models/orvos_base.rb
index 7abbc88d8f33363b1b0bbedd99e70f91d238ea46..365b51db9a2643a88c946d284d770d8107b2f41f 100644 (file)
--- a/app/models/orvos_base.rb
+++ b/app/models/orvos_base.rb
@@ -11,7 +11,8 @@ class OrvosBase < ActiveRecord::Base
       'j58dm' => 'orvos#specimen',
       'mxsvm' => 'orvos#pipeline',
       'uo14g' => 'orvos#pipeline_invocation',
-      'ldvyl' => 'orvos#project'
+      'j7d0g' => 'orvos#group',
+      'ldvyl' => 'orvos#group' # only needed for legacy Project objects
     }
   end
 

diff --git a/app/models/project.rb b/app/models/project.rb
deleted file mode 100644 (file)
index 1ee3b14..0000000
--- a/app/models/project.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class Project < OrvosBase
-end

diff --git a/app/views/collections/index.html.erb b/app/views/collections/index.html.erb
index 80d27f877d68b1069df2f32cf682d589e889d8cd..f4b4c43fec90f044b0c17229eeb708b929985a9f 100644 (file)
--- a/app/views/collections/index.html.erb
+++ b/app/views/collections/index.html.erb
@@ -10,7 +10,7 @@
       </th><th>
        protected
       </th><th>
-       projects
+       groups
       </th><th>
        origin
       </th>
@@ -32,7 +32,7 @@
       </td><td>
        <%= ('Y' if c[:wanted_by_me]) or ('y' if c[:wanted]) %>
       </td><td>
-       <%= c[:projects].size if c[:projects] %>
+       <%= c[:groups].size if c[:groups] %>
       </td><td>
        <% if c[:origin] %>
        <span class="deemphasize"><%= c[:origin].name %></span>

diff --git a/app/views/projects/show.html.erb b/app/views/groups/show.html.erb
similarity index 100%
rename from app/views/projects/show.html.erb
rename to app/views/groups/show.html.erb

diff --git a/config/routes.rb b/config/routes.rb
index 2e019a7c4e3d20ef52221fd286655336c13ed169..21df9e6a391c0149fc42d2d5698b4d08be2c7109 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -22,7 +22,7 @@ Vcffarm::Application.routes.draw do
   resources :uploaded_datasets
 
 
-  resources :projects
+  resources :groups
 
 
   resources :specimens

diff --git a/test/fixtures/projects.yml b/test/fixtures/groups.yml
similarity index 100%
rename from test/fixtures/projects.yml
rename to test/fixtures/groups.yml

diff --git a/test/functional/projects_controller_test.rb b/test/functional/groups_controller_test.rb
similarity index 100%
rename from test/functional/projects_controller_test.rb
rename to test/functional/groups_controller_test.rb

diff --git a/test/unit/project_test.rb b/test/unit/group_test.rb
similarity index 100%
rename from test/unit/project_test.rb
rename to test/unit/group_test.rb

diff --git a/test/unit/helpers/projects_helper_test.rb b/test/unit/helpers/groups_helper_test.rb
similarity index 100%
rename from test/unit/helpers/projects_helper_test.rb
rename to test/unit/helpers/groups_helper_test.rb