curate 0.6.5 → 0.6.6

data/app/repository_models/profile_section.rb

@@ -4,7 +4,6 @@ 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/services/curation_concern/work_permission_action_parser.rb

@@ -0,0 +1,78 @@
+# This module is used to take a params hash from the Work edit form (it uses nested attributes)
+# and decide what action needs to happen for each editor listed in the Work.
+# The possibilities are: none, create, destroy
+
+module CurationConcern::WorkPermissionActionParser
+
+  def self.convert_params( class_name, params )
+
+    action = self.decide_editorship_action( class_name, params )
+    self.build_params( class_name, params, action ) 
+    
+  end
+
+  private
+  
+  # Parse the params from the Work update form and decide the action
+  def self.decide_editorship_action( class_name, params )
+    
+    editor_action=[]
+    if !params[class_name]["editors_attributes"].nil?
+      
+      params[class_name]["editors_attributes"].each do |key, value|
+        params_action(key, value, editor_action, params)
+      end
+    end  
+
+    group_action=[]
+    if !params[class_name]["editor_groups_attributes"].nil?
+      params[class_name]["editor_groups_attributes"].each do |key, value|
+        params_action(key, value, group_action, params)
+      end
+    end
+    
+    {editors: editor_action, groups: group_action}
+    
+  end
+
+
+  def self.params_action(key, value, action, params)
+    if !value["id"].nil? and value["id"] != "" and !value["_destroy"].nil? and value["_destroy"] == ""
+      action << "none" if params["commit"].include?("Update")
+      action << "create" if params["commit"].include?("Create")
+    elsif !value["id"].nil? and value["id"] != "" and value["_destroy"].nil?
+      action << "create"
+    elsif !value["id"].nil? and value["id"] != "" and !value["_destroy"].nil?
+      action << "destroy"
+    elsif !value["id"].nil? and value["id"] == "" and value["_destroy"].nil?
+      action << "none"
+    end
+  end
+  
+  # Build the param hash to be used by WorkEditorship
+  def self.build_params( class_name, params, action )
+    editor_params_aggregate = []
+    group_params_aggregate = []
+    
+    if action.has_key?(:editors)
+      action[:editors].each_with_index do |editor_action, index|
+        person_id = params[class_name]["editors_attributes"][index.to_s]["id"]
+        if person_id
+          editor_params_aggregate << Hash[person_id: person_id, action: editor_action]
+        end
+      end
+    end
+
+    if action.has_key?(:groups)
+      action[:groups].each_with_index do |group_action, index|
+        group_id = params[class_name]["editor_groups_attributes"][index.to_s]["id"]
+        if group_id
+          group_params_aggregate << Hash[group_id: group_id, action: group_action]
+        end
+      end
+    end
+
+    { work_id: params[:id], editors: editor_params_aggregate, editor_groups: group_params_aggregate }
+  end
+  
+end

data/app/services/hydramata/group_membership_action_parser.rb

@@ -0,0 +1,65 @@
+# This module is used to take a params hash from the Group edit form (it uses nested attributes)
+# and decide what action needs to happen for each member listed in the Group.
+# The possibilities are: none, create, destroy
+
+module Hydramata::GroupMembershipActionParser
+
+  def self.convert_params(params, current_user)
+
+     action = self.decide_membership_action(params)
+     self.build_params(params, action, current_user) 
+    
+  end
+
+  private
+  
+  # Parse the params from the Group update form and decide the action
+  def self.decide_membership_action(params)
+    
+    action=[]
+    #validate prescence of required params 
+    if !params["hydramata_group"]["title"].nil? and !params["hydramata_group"]["description"].nil? and !params["hydramata_group"]["members_attributes"].nil?
+      
+      params["hydramata_group"]["members_attributes"].each do |key, value|
+        if !value["id"].nil? and !value["_destroy"].nil? and value["_destroy"] == ""
+          #do nothing with membership
+          action << "none"
+        elsif !value["id"].nil? and value["id"] != "" and value["_destroy"].nil?
+          #add member
+          action << "create"
+        elsif !value["id"].nil? and value["id"] != "" and !value["_destroy"].nil?
+          #remove member
+          action << "destroy"
+        elsif !value["id"].nil? and value["id"] == "" and value["_destroy"].nil?
+          #empty member field, do nothing with membership
+          action << "none"
+        else
+          raise Exception, "Exception placeholder"
+        end
+      end
+      
+    else
+      raise Exception, "Exception placeholder"
+    end
+    
+    action
+    
+  end
+  
+  # Build the param hash to be used by GroupMembershipForm 
+  def self.build_params(params, action, current_user)
+    new_params_aggregate = []
+    
+    action.each_with_index do |member_action, index|
+      person_id = params["hydramata_group"]["members_attributes"][index.to_s]["id"]
+      if person_id
+        role = params["group_member"]["edit_users_ids"].include?(person_id) ? "manager" : "member"
+        new_params_hash = Hash[person_id: person_id, action: member_action, role: role]
+        new_params_aggregate << new_params_hash
+      end
+    end
+    { group_id: params[:id], current_user: current_user, title: params["hydramata_group"]["title"], description: params["hydramata_group"]["description"], members: new_params_aggregate }
+  end
+  
+
+end

data/app/views/catalog/_facets.html.erb

@@ -4,7 +4,9 @@
 
   <label class="search-scope">
     <%= radio_button_tag 'works', 'mine', params['works'] == 'mine' %>
-    <span class="label-text">Only My Works</span>
+    <span class="label-text">Only My 
+      <%= catalog_type %>
+    </span>
   </label>
 
   <label class="search-scope">

data/app/views/catalog/index.html.erb

@@ -23,6 +23,9 @@
     <i class="icon-search icon-large"></i>
     Limited to:
       <%= render_constraints(params) %>
+    <div>
+      <%= link_to( "Clear limits", "/?", :class => 'btn' ) %>
+    </div>
   </div>
 
   <%= render :partial => 'did_you_mean' %>

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

@@ -37,6 +37,16 @@
     </div>
   </div>
 
+  <div class="control-group string required collection_description">
+    <%= render :partial => 'catalog/_index_partials/thumbnail_display', locals: {document: @collection} %>
+    <span class="control-label">
+      <%= f.label :avatar %>
+    </span>
+    <div class="controls">
+      <%= f.file_field :file, label: 'Upload the file' %>
+    </div>
+  </div>
+
   <%= render partial: 'form_permission', locals: {f: f} %>
 
   <%= hidden_collection_members %>

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

@@ -1,5 +1,6 @@
 <% content_for :page_title, curation_concern_page_title(@collection) %>
 <% content_for :page_header do %>
+  <%= render :partial => 'catalog/_index_partials/thumbnail_display', locals: {document: @collection} %>
   <h1> <%= @collection.title %> </h1>
 <% end %>
 <% if can? :edit, @collection %>

data/app/views/curate/people/_profile_image.html.erb

@@ -1,5 +1,5 @@
 <%- if person.medium.has_content? -%>
-  <%= image_tag download_path( person.pid, { datastream_id: 'medium' } )  %>
+  <%= image_tag download_path( person.pid, { datastream_id: 'medium' } ), class: 'framed-picture'  %>
 <%- else -%>
-  <%= image_tag person.gravatar_link, class: 'gravatar' %>
+  <%= image_tag person.gravatar_link, class: 'gravatar, framed-picture' %>
 <%- end -%>

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

@@ -1,50 +1,28 @@
 <% content_for :page_title, "#{person_name_or_stub(@person)} // Curate" %>
 
 <% content_for :page_header do %>
-<hgroup>
-  <h1><%= @person.name %></h1>
-  <% unless @person.title.blank? %>
-    <h3><%= @person.title %></h3>
-  <% end %>
-</hgroup>
+  <hgroup>
+    <h1><%= @person.name %></h1>
+    <% unless @person.title.blank? %>
+      <h3><%= @person.title %></h3>
+    <% end %>
+  </hgroup>
 <% end %>
-<div class="row">
 
-  <div class="span3">
-    <div class="profile-picture">
-      <%= render partial: 'profile_image', locals: {person: @person} %>
-    </div>
-
-    <dl class="<%= dom_class(@person) %>">
-      <%# This is where I tell Jeremy I'm sorry. %>
-        <% @person.terms_for_display.reject{|name| name == :name}.each do |attribute_name| %>
-          <% if @person.send(attribute_name).present? %>
-            <dt><%="#{derived_label_for( @person, attribute_name) }:" %></dt>
-            <% [@person.send(attribute_name)].flatten.compact.each do |value| %>
-              <%= auto_link_without_protocols(value) %>
-            <% end %>
-        <% end %>
-      <% end %>
-    </dl>
+<div class="row">
 
-    <% if can? :edit, @person %>
-      <div class="form-action">
-        <%= link_to "Update Personal Information", edit_user_registration_path, class: 'btn btn-primary' %>
-      </div>
-    <% end %>
-  </div>
+  <div id="person_profile" class="span8">
 
-  <div id="person_profile" class="span9">
     <% if profile_has_contents?(@person) %>
       <% if @person.profile.title == @person.name %>
-        <h3><%= "Selected Works of #{@person.name}" %></h3>
+        <h3>Selected Works</h3>
       <% else %>
         <h3><%= @person.profile.title %></h3>
       <% end %>
       <p><%= @person.profile.description %> </p>
 
       <div id="documents" class="clear">
-        <%= list_items_in_collection(@person.profile) %>
+        <%= list_items_in_collection(@person.profile, terminate=false, options={:display_contributors=>false}) %>
       </div>
     <% elsif current_user.respond_to?(:person) && @person == current_user.person %>
       <p class="center no-documents">
@@ -52,11 +30,45 @@
       </p>
     <% end %>
 
-    <% if can_edit_profile_collection?(@person) %>
+    <% if can_edit_profile_collection?(@person) && @person == current_user.person %>
+        <div class="form-action">
+          <%= link_to 'Add a Section to my Profile', new_collection_path(add_to_profile: true), class: 'btn btn-primary' %>
+        </div>
+    <% end %>
+  </div>
+
+  <div id="profile_details" class="span4, profile-details">
+    <div class="profile-picture">
+      <%= render partial: 'profile_image', locals: {person: @person} %>
+    </div>
+
+    <table class="<%= dom_class(@person) %>">
+
+      <% @person.terms_for_display.reject{|name| name == :name}.each do |attribute_name| %>
+        <% if @person.send(attribute_name).present? %>
+        <tr>
+          <th scope="row"><%="#{derived_label_for( @person, attribute_name) }:" %></th>
+          <td>
+            <% [@person.send(attribute_name)].flatten.compact.each do |value| %>
+              <%= auto_link_without_protocols(value) %>
+            <% end %>
+          </td>
+        </tr>
+        <% end %>
+      <% end %>
+
+    </table>
+
+    <% if can? :edit, @person %>
       <div class="form-action">
-        <%= link_to 'Add a Section to my Profile', new_collection_path(add_to_profile: true), class: 'btn btn-primary' %>
+        <% if current_user.manager? %>
+          <%= link_to "Update #{@person.name}'s Information", edit_user_path(User.where(repository_id: @person.id).first.id), class: 'btn btn-primary' %>
+        <% else %>
+          <%= link_to "Update Personal Information", edit_user_registration_path, class: 'btn btn-primary' %>
+        <% end %>
       </div>
     <% end %>
   </div>
+
 </div>
 

data/app/views/curation_concern/articles/_attributes.html.erb

@@ -18,5 +18,6 @@
     </td>
   </tr>
   <%= curation_concern_attribute_to_html(curation_concern, :embargo_release_date, "Embargo Release Date") %>
+  <%= curation_concern_attribute_to_html(curation_concern, :rights, "Content License") %>
   </tbody>
 </table>

data/app/views/curation_concern/base/_form.html.erb

@@ -1,4 +1,5 @@
 <%= simple_form_for [:curation_concern, curation_concern] do |f| %>
+  
   <% if f.error_notification -%>
     <div class="alert alert-error fade in">
       <strong>Wait don't go!</strong> There was a problem with your submission. Please review the errors below:

data/app/views/curation_concern/base/_form_descriptive_fields.erb

@@ -3,6 +3,15 @@
     <%= render "form_required_information", curation_concern: curation_concern, f: f %>
   </div>
 
+
+  <div class="span6" id="required-information">
+    <%= render "linked_editors", curation_concern: curation_concern, f: f %>
+  </div>
+
+  <div class="span6" id="additional-information">
+    <%= render "linked_groups", curation_concern: curation_concern, f: f %>
+  </div>
+
   <div class="span6" id="additional-information">
     <%= render "form_additional_information", curation_concern: curation_concern, f: f %>
   </div>

data/app/views/curation_concern/base/_linked_editors.html.erb

@@ -0,0 +1,47 @@
+<% label ||= 'Editor' %>
+<div class="control-group required link-users" id="editors">
+  <span class="control-label">
+    <label class="required" for="<%=f.object.class.to_s.downcase%>_editors_attributes_0_name">
+      <%# NOTE: Whenever you just copy the HTML generated by Simple Form it breaks internationalization %>
+      <%= I18n.t('simple_form.required.html', default: '<abbr title="" data-original-title="required">*</abbr>').html_safe %>
+      <%= label %>
+    </label>
+  </span>
+  <div class="controls">
+    <% prefix = f.object.class.to_s.downcase %>
+
+    <script id="entry-template" type="text/x-handlebars-template">
+      <li class="field-wrapper input-append">
+        <input id="<%=prefix %>_editors_attributes_{{index}}_id" name="<%=prefix %>[editors_attributes][{{index}}][id]" type="hidden" value="" />
+        <input class="input-xlarge autocomplete-users" data-url="/people" id="<%=prefix %>_editors_attributes_{{index}}_name" name="<%=prefix %>[editors_attributes][{{index}}][name]" type="text" value="" />
+        <span class="field-controls"><button class="btn btn-success add"><i class="icon-white icon-plus"></i><span>Add</span></button></span>
+      </li>
+    </script>
+    <script id="existing-user-template" type="text/x-handlebars-template">
+      <li class="field-wrapper input-append">
+        <span class="linked-user"><a href="/people/{{value}}" target="_new">{{label}}</a></span>
+        <input type="hidden" name="<%=prefix %>[editors_attributes][{{index}}][id]" value="{{value}}">
+        <span class="field-controls"><button class="btn btn-danger remove"><i class="icon-white icon-minus"></i><span>Remove</span></button></span>
+      </li>
+    </script>
+    <ul class="listing">
+    
+    <%= f.fields_for :editors do |editor| %>
+      <li class="field-wrapper input-append">
+        <%= editor.hidden_field :id %>
+        <%= editor.hidden_field :_destroy %>
+        <% if editor.object.persisted? %>
+          <span class="linked-user"><%=link_to editor.object.name, person_path(editor.object), target: '_new' %></span>
+        <% else %>
+          <%= editor.text_field :name,
+            class: 'input-xlarge autocomplete-users', 'data-url' => people_path, required: editor.index == 0  %>
+        <% end %>
+
+        <span class="field-controls"></span>
+      </li>
+    <% end %>
+    
+    </ul>
+  </div>
+</div>
+

data/app/views/curation_concern/base/_linked_groups.html.erb

@@ -0,0 +1,45 @@
+<% label ||= 'Groups' %>
+<div class="control-group required link-groups" id="groups">
+  <span class="control-label">
+    <label for="<%=f.object.class.to_s.downcase%>_editor_groups_attributes_0_title">
+      <%# NOTE: Whenever you just copy the HTML generated by Simple Form it breaks internationalization %>
+      <%= label %>
+    </label>
+  </span>
+  <div class="controls">
+    <% prefix = f.object.class.to_s.downcase %>
+
+    <script id="entry-template" type="text/x-handlebars-template">
+      <li class="field-wrapper input-append">
+        <input id="<%=prefix %>_editor_groups_attributes_{{index}}_id" name="<%=prefix %>[editor_groups_attributes][{{index}}][id]" type="hidden" value="" />
+        <input class="input-xlarge autocomplete-groups" data-url="/hydramata/groups" id="<%=prefix %>_editor_groups_attributes_{{index}}_title" name="<%=prefix %>[editor_groups_attributes][{{index}}][title]" type="text" value="" />
+        <span class="field-controls"><button class="btn btn-success add"><i class="icon-white icon-plus"></i><span>Add</span></button></span>
+      </li>
+    </script>
+    <script id="existing-group-template" type="text/x-handlebars-template">
+      <li class="field-wrapper input-append">
+        <span class="linked-group"><a href="/hydramata/groups/{{value}}" target="_new">{{label}}</a></span>
+        <input type="hidden" name="<%=prefix %>[editor_groups_attributes][{{index}}][id]" value="{{value}}">
+        <span class="field-controls"><button class="btn btn-danger remove"><i class="icon-white icon-minus"></i><span>Remove</span></button></span>
+      </li>
+    </script>
+    <ul class="listing">
+    
+    <%= f.fields_for :editor_groups do |group| %>
+      <li class="field-wrapper input-append">
+        <%= group.hidden_field :id %>
+        <%= group.hidden_field :_destroy %>
+        <% if group.object.persisted? %>
+          <span class="linked-group"><%=link_to group.object.title, hydramata_group_path(group.object), target: '_new' %></span>
+        <% else %>
+          <%= group.text_field :title, class: 'input-xlarge autocomplete-groups', 'data-url' => hydramata_groups_path  %>
+        <% end %>
+
+        <span class="field-controls"></span>
+      </li>
+    <% end %>
+    
+    </ul>
+  </div>
+</div>
+

data/app/views/curation_concern/base/_persons_edit_access.html.erb

@@ -0,0 +1,44 @@
+<% label ||= 'People with Edit Access' %>
+<div class="control-group required link-users" id="editors">
+  <span class="control-label">
+    <label class="required" for="<%=f.object.class.to_s.downcase%>_editors_0_name">
+      <%# NOTE: Whenever you just copy the HTML generated by Simple Form it breaks internationalization %>
+      <%= I18n.t('simple_form.required.html', default: '<abbr title="" data-original-title="required">*</abbr>').html_safe %>
+      <%= label %>
+    </label>
+  </span>
+  <div class="controls">
+    <% prefix = f.object.class.to_s.downcase %>
+    <script id="entry-template" type="text/x-handlebars-template">
+      <li class="field-wrapper input-append">
+        <input id="<%=prefix %>_editors_{{index}}_id" name="<%=prefix %>[editors][{{index}}][id]" type="hidden" value="" />
+        <input class="input-xlarge autocomplete-users" data-url="/people" id="<%=prefix %>_editors_{{index}}_name" name="<%=prefix %>[editors][{{index}}][name]" type="text" value="" />
+        <span class="field-controls"><button class="btn btn-success add"><i class="icon-white icon-plus"></i><span>Add</span></button></span>
+      </li>
+    </script>
+    <script id="existing-user-template" type="text/x-handlebars-template">
+      <li class="field-wrapper input-append">
+        <span class="linked-user"><a href="/people/{{value}}" target="_new">{{label}}</a></span>
+        <input type="hidden" name="<%=prefix %>[editors][{{index}}][id]" value="{{value}}">
+        <span class="field-controls"><button class="btn btn-danger remove"><i class="icon-white icon-minus"></i><span>Remove</span></button></span>
+      </li>
+    </script>
+    <ul class="listing">
+    <%= f.fields_for :editors do |editor| %>
+      <li class="field-wrapper input-append">
+        <%= editor.hidden_field :id %>
+        <%= editor.hidden_field :_destroy %>
+        <% if editor.object.persisted? %>
+          <span class="linked-user"><%=link_to editor.object.name, editor.object, target: '_new' %></span>
+        <% else %>
+          <%= editor.text_field :name,
+            class: 'input-xlarge autocomplete-users', 'data-url' => people_path, required: editor.index == 0  %>
+        <% end %>
+
+        <span class="field-controls"></span>
+      </li>
+    <% end %>
+    </ul>
+  </div>
+</div>
+