curate 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9da5c8f5b08a3fd6e12448c7dd7c73a2412246a0
-  data.tar.gz: 165283f25fa8b99a984b41b895e29a8623bf8e6e
+  metadata.gz: 1fa358950a239086a07e5b88759c3eaedda3e6c1
+  data.tar.gz: 5e456c912433755c7efd0eb7deba3143ecde8117
 SHA512:
-  metadata.gz: 5e2a7f0f07daa348c38ce009f121a97e1fe1d7a150c8620a77ca1c62ffe9d13b20ddf9c40fa7bf8e869279cb589cf12e1825c585c4b0534ea95bc8fd61942296
-  data.tar.gz: f177f00845ea7bc440c098e645d48dfd7ab374460de15732c353c236721a1128ce8c2f3bfae1d0d19f4761cf2287a0c8cce2a201a2e964d39f9cb9f90ce63f13
+  metadata.gz: fb47c5e65196b02aa49c6cb0758f551b58b84b0cb26c09bc26570aaca675cdc518146f6e898c544ffa1f60f27a44f274f844f524b600597c2ee1cc9b9aa543ea
+  data.tar.gz: 021f90b2c9a230eb6b56322ee15ef5d9a0d85a38c6e8a787aceaad95d33c7c6d09294403e43413b1a11acd603246896e42e11057f132ec7e9516070787812385

data/app/controllers/curate/organizations_controller.rb

@@ -0,0 +1,96 @@
+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

@@ -0,0 +1,13 @@
+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/helpers/curate_helper.rb

@@ -1,5 +1,9 @@
 module CurateHelper
 
+  def curation_concern_organization_path(document)
+    organization_path(document)
+  end
+
   # Loads the object and returns its title
   def collection_title_from_pid  value
     begin

data/app/models/concerns/curate/ability.rb

@@ -7,6 +7,14 @@ module Curate
 
     def curate_permissions
       alias_action :confirm, :copy, :to => :update
+      if current_user.manager?
+        can [:edit, :update, :destroy], :all
+        cannot [:edit, :update, :destroy], Person
+        cannot [:edit, :update, :destroy], Profile do |p|
+          p.pid != current_user.profile.pid
+        end
+      end
+
       can :edit, Person do |p|
         p.pid == current_user.repository_id
       end

data/app/models/curate/user_behavior/base.rb

@@ -19,10 +19,23 @@ module Curate
         Collection.where(Hydra.config[:permissions][:edit][:individual] => user_key)
       end
 
+      def organizations
+        Organization.where(Hydra.config[:permissions][:edit][:individual] => user_key)
+      end
+
       def get_value_from_ldap(attribute)
         # override
       end
 
+      def manager?
+        username = self.respond_to?(:username) ? self.username : self.to_s
+        !!manager_usernames.include?(username)
+      end
+
+      def manager_usernames
+        @manager_usernames ||= YAML.load(ERB.new(Rails.root.join('config/manager_usernames.yml').read).result)[Rails.env]['manager_usernames']
+      end
+
       def name
         read_attribute(:name) || user_key
       end

data/app/repository_models/collection.rb

@@ -4,6 +4,7 @@ class Collection < ActiveFedora::Base
   include Hydra::Collections::Collectible
 
   def can_be_member_of_collection?(collection)
+    return false if collection.is_a?(Organization)
     collection == self ? false : true
   end
 end

data/app/repository_models/curation_concern/model.rb

@@ -41,6 +41,7 @@ module CurationConcern
     end
 
     def can_be_member_of_collection?(collection)
+      return false if collection.is_a?(Organization)
       collection == self ? false : true
     end
 

data/app/repository_models/organization.rb

@@ -0,0 +1,17 @@
+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/repository_models/person.rb

@@ -105,6 +105,7 @@ class Person < ActiveFedora::Base
   end
 
   def can_be_member_of_collection?(collection)
+    return true if collection.is_a?(Organization)
     false
   end
 

data/app/repository_models/profile_section.rb

@@ -4,6 +4,7 @@ class ProfileSection < ActiveFedora::Base
   include CurationConcern::CollectionModel
 
   def can_be_member_of_collection?(collection)
+    return false if collection.is_a?(Organization)
     collection.is_a?(Profile)
   end
 end

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

@@ -0,0 +1 @@
+<%= 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/_document_list.html.erb

@@ -0,0 +1,11 @@
+<table class="table table-striped">
+  <caption class="accessible-hidden">List of collections</caption>
+  <thead>
+  <tr>
+    <th>Title</th>
+  </tr>
+  </thead>
+  <tbody>
+  <%= render documents, :as => :document %>
+  </tbody>
+</table>

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

@@ -0,0 +1,49 @@
+<div class="container">
+<%-# This syntax [collections, @collection] tells form_for to use the routes from the engine named collections %>
+<%= form_for @organization do |f| %>
+  <% if @organization.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@organization.errors.count, "error") %> prohibited this topic from being saved:</h2>
+
+      <ul>
+      <% @organization.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <%#
+    NOTE: We're just making it _look_ like we're using simple_form here. Refactor at will.
+    ALSO: Title isn't _actually_ required. The form is lying (but it means well and is probably right).
+  %>
+  <div class="control-group string required organization_title">
+    <span class="control-label">
+      <label class="string required" for="organization_title">
+        <abbr title="" data-original-title="required">*</abbr> Title
+      </label>
+    </span>
+    <div class="controls">
+      <%= f.text_field :title, class: 'string required input-xlarge', required: 'required', :'aria-required' => 'true' %>
+    </div>
+  </div>
+
+  <div class="control-group string required collection_description">
+    <span class="control-label">
+      <%= f.label :description %>
+    </span>
+    <div class="controls">
+      <%= f.text_area :description, class: 'text input-xxlarge' %>
+    </div>
+  </div>
+
+  <div class="form-actions">
+    <%= f.submit class: 'btn btn-primary' %>
+    <%- if @organization.persisted? -%>
+      <%= link_to 'Cancel', organization_path(@organization), class: 'btn btn-link' %>
+    <% else %>
+      <%= link_to 'Cancel', root_path, class: 'btn btn-link' %>
+    <% end %>
+  </div>
+<% end %>
+</div>

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

@@ -0,0 +1,24 @@
+<tr>
+  <td>
+    <%= link_to organization.title, organization_path(organization) %>
+  </td>
+  <td>
+    <% if can? :edit, organization %>
+
+        <%= 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 pull-right' %>
+    <% end %>
+  </td>
+</tr>

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

@@ -0,0 +1,4 @@
+<% 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

@@ -0,0 +1,11 @@
+<%- 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/new.html.erb

@@ -0,0 +1,4 @@
+<% content_for :page_header do %>
+  <h1>Create a New Organization</h1>
+<% end %>
+<%= render 'form' %>

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

@@ -0,0 +1,27 @@
+<% 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

@@ -0,0 +1,30 @@
+<%# 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/app/views/shared/_add_content.html.erb

@@ -20,6 +20,7 @@
     </li>
     <li class="divider"></li>
     <li><%= link_to 'Add a Collection',  new_collection_path, class: 'menu-heading new-collection', role: 'menuitem' %></li>
+    <li><%= link_to 'Add an Organization',  new_organization_path, class: 'menu-heading new-collection', role: 'menuitem' %></li>
   </ul>
 </div>
 

data/lib/curate/rails/routes.rb

@@ -12,6 +12,7 @@ module ActionDispatch::Routing
             put :remove_member
           end
         end
+        resources 'organizations'
         resources 'people', only: [:show, :index] do
           resources :depositors, only: [:index, :create, :destroy]
         end

data/lib/curate/version.rb

@@ -1,3 +1,3 @@
 module Curate
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/lib/generators/curate/application_template.rb

@@ -13,7 +13,7 @@ end
 with_git("Initial commit")
 
 with_git("Adding curate gem") do
-  gem 'curate', "~> 0.6.4"
+  gem 'curate', "~> 0.6.5"
 end
 
 HELPFUL_DEVELOPMENT_TOOLS =

data/lib/generators/curate/curate_generator.rb

@@ -95,6 +95,9 @@ This generator makes the following changes to your application:
     end
   end
 
+  def create_manager_usernames
+    create_file('config/manager_usernames.yml', "development:\n  manager_usernames:\n  - manager@example.com\ntest:\n  manager_usernames:\n  - manager@example.com\nproduction:\n  manager_usernames:\n  - manager@example.com\n")
+  end
 
   def create_recipients_list
     create_file('config/recipients_list.yml', "---\n- hello@world.com\n")