curate 0.6.5 → 0.6.6

data/app/controllers/curate/organizations_controller.rb

@@ -1,96 +0,0 @@
-class Curate::OrganizationsController < ApplicationController
-  include Blacklight::Catalog
-  include Hydra::CollectionsControllerBehavior
-  include Hydra::AccessControlsEnforcement
-  include Sufia::Noid
-
-  Curate::OrganizationsController.solr_search_params_logic += [:only_organizations] 
-
-  prepend_before_filter :normalize_identifier, only: [:show]
-  respond_to(:html)
-  with_themed_layout '1_column'
-
-  add_breadcrumb 'Organizations', lambda {|controller| controller.request.path }
-
-  before_filter :load_and_authorize_organization, only: [:show, :edit, :delete, :update]
-  before_filter :authenticate_user!, except: :show
-  before_filter :agreed_to_terms_of_service!
-  before_filter :force_update_user_profile!
-
-  def index
-    super
-  end
-
-  def new
-    @organization = Organization.new
-  end
-
-  def create
-    @organization = Organization.new(params[:organization])
-    @organization.apply_depositor_metadata(current_user.user_key)
-    if @organization.save
-      flash[:notice] = "Organization created successfully."
-      redirect_to organizations_path
-    else
-      flash[:error] = "Organization was not created."
-      render action: :new
-    end
-  end
-
-  def update
-    @orgnization = Organization.find(params[:id])
-    if @organization.update_attributes(params[:organization])
-      flash[:notice] = "Ogranization updated successfully."
-      redirect_to organization_path(@organization)
-    else
-      flash[:error] = "Organization was not updated."
-      render action: :edit
-    end
-  end
-
-  def destroy
-    @organization = Organization.find(params[:id])
-    title = @organization.to_s
-    @organization.destroy
-    after_destroy_response(title)
-  end
-
-  def after_destroy_response(title)
-    flash[:notice] = "Deleted #{title}"
-    respond_with { |wants|
-      wants.html { redirect_to catalog_index_path }
-    }
-  end
-  protected :after_destroy_response
-
-  private
-
-  def load_and_authorize_organization
-    id = id_from_params(:id)
-    return nil unless id
-    @organization = ActiveFedora::Base.find(id, cast: true)
-    authorize! :update, @organization
-  end
-
-  def id_from_params(key)
-    if params[key] && !params[key].empty?
-      params[key]
-    end
-  end
-
-  def organizations
-    self
-  end
-
-  ### Turn off this filter query if it's the index action
-  def include_collection_ids(solr_parameters, user_parameters)
-    return if params[:action] == 'index'
-    super
-  end
-
-  def only_organizations(solr_parameters, user_parameters)
-    solr_parameters[:fq] ||= []
-    solr_parameters[:fq] << "has_model_ssim:\"info:fedora/afmodel:Organization\""
-    return solr_parameters
-  end
-end

data/app/helpers/curate/organizations_helper.rb

@@ -1,13 +0,0 @@
-module Curate::OrganizationsHelper
-
-  # Displays the Organizations create organization button.
-  def button_for_create_new_organization(label = 'Create Organization')
-    render partial: 'button_create_organization', locals:{label:label}
-  end
-
-  def has_any_organizations?
-    #false
-    current_user.organizations.count > 0 if current_user
-  end
-
-end

data/app/repository_models/organization.rb

@@ -1,17 +0,0 @@
-class Organization < ActiveFedora::Base
-  include Hydra::Collection
-  include CurationConcern::CollectionModel
-  include Hydra::AccessControls::Permissions
-  include Hydra::AccessControls::WithAccessRight
-  include Sufia::Noid
-
-  # An organization cannot be a member of any other type of collection.
-  def can_be_member_of_collection?(collection)
-    false
-  end
-
-  def to_s
-    title
-  end
-
-end

data/app/views/curate/organizations/_button_create_organization.html.erb

@@ -1 +0,0 @@
-<%= button_to label, new_organization_path, :method=>:get, :class=>"btn btn-primary collection-add submits-batches", 'data-behavior'=>'hydra-collections', :id=>'hydra-organization-add' %>

data/app/views/curate/organizations/edit.html.erb

@@ -1,4 +0,0 @@
-<% content_for :page_header do %>
-  <h1><%= @organization %> <span class="human_readable_type">(<%= @organization.human_readable_type %>)</span></h1>
-<% end %>
-<%= render 'form' %>

data/app/views/curate/organizations/index.html.erb

@@ -1,11 +0,0 @@
-<%- if has_any_organizations? %>
-  <%= render_document_index %>
-<%- else %>
-  <div class="span12 main-header">
-    <p>You have no organizations yet.</p>
-  </div>
-<%- end %>
-
-<% if can? :create, Organization %>
-  <%= button_for_create_new_organization %>
-<% end %>

data/app/views/curate/organizations/show.html.erb

@@ -1,27 +0,0 @@
-<% content_for :page_title, curation_concern_page_title(@organization) %>
-<% content_for :page_header do %>
-  <h1> <%= @organization.title %> </h1>
-<% end %>
-<% if can? :edit, @organization %>
-  <% content_for :page_actions do %>
-
-  <%= button_to(
-    "Delete",
-    {
-      action: :destroy,
-      controller: :organizations,
-      id: @organization.id
-    },
-    data: {confirm: 'Are you sure you want to delete this organization?'},
-    class: 'btn',
-    form_class: 'button-to pull-right',
-    method: :delete
-  )%>
-
-    <%= link_to 'Edit', edit_organization_path(@organization), class: 'btn' %>
-  <% end %>
-<% end %>
-<div class="organization-description">
-  <%= @organization.description %>
-</div>
-

data/app/views/organizations/_organization.html.erb

@@ -1,30 +0,0 @@
-<%# This is a search result view %>
-<% noid = organization.noid %>
-<% solr_doc = organization.inner_object.solr_doc %>
-<li id="document_<%= noid %>" class="search-result">
-
-  <%= render :partial => 'catalog/_index_partials/identifier_and_action', locals: { document: organization, counter: organization_counter, title_link_target: organization, edit_path: edit_organization_path(organization), solr_doc: solr_doc } %>
-
-  <div class="row-fluid">
-
-    <div class="span2">
-      <%= render :partial => 'catalog/_index_partials/thumbnail_display', locals: {document: organization} %>
-    </div>
-
-    <div class="span10">
-      <dl class="attribute-list">
-        <% if solr_doc.has?('desc_metadata__description_tesim') %>
-          <dt>Description:</dt>
-          <dd><%= truncate(render_index_field_value(document: solr_doc, field: 'desc_metadata__description_tesim'), length: 150) %></dd>
-        <% end %>
-
-        <% if solr_doc.has?('edit_access_person_ssim') %>
-          <dt>Owner:</dt>
-          <dd><%= render_index_field_value(document: solr_doc, field: 'edit_access_person_ssim') %></dd>
-        <% end %>
-      </dl>
-    </div>
-
-  </div>
-
-</li>

data/spec/controllers/curate/organizations_controller_spec.rb

@@ -1,50 +0,0 @@
-require 'spec_helper'
-
-describe Curate::OrganizationsController do
-  let(:user) { FactoryGirl.create(:user) }
-  before { sign_in user }
-
-  describe "#new" do
-    it 'renders the form' do
-      get :new
-      expect(response).to render_template('new')
-    end
-  end
-
-  describe "#create" do
-    it "should be successful" do
-      expect {
-        post :create, organization:  { title: 'test title', description: 'test desc'}
-      }.to change{Organization.count}.by(1)
-      expect(response).to redirect_to organizations_path
-      expect(flash[:notice]).to eq 'Organization created successfully.'
-    end
-  end
-
-  describe "without access" do
-    describe "#update" do
-      let(:organization) { FactoryGirl.create(:organization) }
-      it "should be able to update permissions" do
-        patch :update, id: organization.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-        expect(response).to redirect_to root_path
-        expect(flash[:alert]).to eq 'You are not authorized to access this page.'
-
-        organization.reload.should_not be_open_access
-      end
-    end
-  end
-
-  describe "with access" do
-    describe "#update" do
-      let(:organization) { FactoryGirl.create(:organization, user: user) }
-      it "should be able to update permissions" do
-        patch :update, id: organization.id, organization: {visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC}
-        expect(response).to redirect_to organization_path(organization)
-        expect(flash[:notice]).to eq 'Ogranization updated successfully.'
-
-        organization.reload.should be_open_access
-      end
-    end
-  end
-
-end

data/spec/factories/organizations_factory.rb

@@ -1,21 +0,0 @@
-FactoryGirl.define do
-  factory :organization do
-    ignore do
-      user {FactoryGirl.create(:user)}
-    end
-    sequence(:title) {|n| "Title #{n}"}
-    before(:create) { |work, evaluator|
-      work.apply_depositor_metadata(evaluator.user.user_key)
-    }
-
-    factory :public_organization do
-      visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-    end
-
-    factory :private_organization do
-      visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-    end
-  end
-
-end
-

data/spec/repository_models/organization_spec.rb

@@ -1,66 +0,0 @@
-require 'spec_helper'
-
-describe Organization do
-  let(:organization) { Organization.new}
-  let(:person) { FactoryGirl.create(:person)}
-  let(:another_person) { FactoryGirl.create(:person)}
-  let(:work) { FactoryGirl.create(:generic_work)}
-
-  describe '#human_readable_type' do
-    it "indicates organization" do
-      organization.human_readable_type.should == 'Organization'
-    end
-  end
-
-  describe '#add_member' do
-    it 'should be able to add people' do
-      expect( organization.members ).to eq([])
-      organization.add_member(person).should be_true
-      expect( organization.members ).to include(person)
-    end
-
-    it 'should not add if collectible is not a person' do
-      expect( organization.members ).to eq([])
-      work = FactoryGirl.create(:generic_work)
-      organization.add_member(work).should be_false
-      expect( organization.members ).to eq([])
-    end
-
-    it 'should handle attempt to add nil' do
-      expect( organization.members ).to eq([])
-      organization.add_member(nil).should be_false
-      expect( organization.members ).to eq([])
-    end
-
-    it 'should handle attempt to add nil' do
-      expect( organization.members ).to eq([])
-      organization.add_member(nil)
-      expect( organization.members ).to eq([])
-    end
-  end
-
-  describe '#remove_member' do
-    it 'should be able to remove people' do
-      organization.add_member(person)
-      expect( organization.members ).to include(person)
-      organization.remove_member(person).should be_true
-      expect( organization.members ).to eq([])
-    end
-
-    it 'should handle attempt to remove person who is not in organization' do
-      organization.add_member(person)
-      expect( organization.members ).to include(person)
-      another_person = FactoryGirl.create(:person)
-      organization.remove_member(another_person).should be_false
-      expect( organization.members ).to include(person)
-    end
-
-    it 'should handle attempt to remove nil' do
-      organization.add_member(person)
-      expect( organization.members ).to include(person)
-      organization.remove_member(nil).should be_false
-      expect( organization.members ).to include(person)
-    end
-  end
-
-end