Skip to content

Commit ddfd612

Browse files
committed
initial work
1 parent c7160c7 commit ddfd612

File tree

10 files changed

+64
-14
lines changed

10 files changed

+64
-14
lines changed

app/dashboards/isilon_asset_dashboard.rb

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,24 @@ class IsilonAssetDashboard < Administrate::BaseDashboard
1111
ATTRIBUTE_TYPES = {
1212
id: Field::Number,
1313
aspace_collection: Field::BelongsTo,
14-
aspace_linking_status: Field::String,
15-
assigned_to: Field::String,
14+
aspace_linking_status: Field::Select.with_options(
15+
collection: ->(_field) { [ [ "", "" ], [ "True", "true" ], [ "False", "false" ] ] }
16+
),
17+
assigned_to: Field::BelongsTo.with_options(class_name: "User"),
1618
contentdm_collection: Field::BelongsTo,
1719
date_created_in_isilon: Field::String,
1820
duplicates: DuplicatesField.with_options(
1921
class_name: "IsilonAsset"
2022
),
2123
has_duplicates: HasDuplicatesField,
2224
file_checksum: Field::String,
23-
file_size: Field::String,
25+
file_size: FileSizeField,
2426
file_type: Field::String,
2527
isilon_name: Field::String,
2628
isilon_path: Field::String,
2729
full_path_with_volume: Field::String,
2830
last_modified_in_isilon: Field::String,
29-
last_updated_by: Field::String,
31+
last_updated_by: LastUpdatedByField,
3032
migration_status: Field::BelongsTo,
3133
notes: Field::Text,
3234
preservica_reference_id: Field::String,
@@ -56,8 +58,6 @@ class IsilonAssetDashboard < Administrate::BaseDashboard
5658
id
5759
migration_status
5860
isilon_name
59-
isilon_path
60-
parent_folder
6161
full_path_with_volume
6262
date_created_in_isilon
6363
last_modified_in_isilon
@@ -82,7 +82,7 @@ class IsilonAssetDashboard < Administrate::BaseDashboard
8282
FORM_ATTRIBUTES = %i[
8383
migration_status
8484
isilon_name
85-
isilon_path
85+
full_path_with_volume
8686
date_created_in_isilon
8787
last_modified_in_isilon
8888
file_size
@@ -94,7 +94,6 @@ class IsilonAssetDashboard < Administrate::BaseDashboard
9494
preservica_reference_id
9595
notes
9696
assigned_to
97-
last_updated_by
9897
].freeze
9998

10099
# COLLECTION_FILTERS

app/dashboards/user_dashboard.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class UserDashboard < Administrate::BaseDashboard
6565
# Overwrite this method to customize how users are displayed
6666
# across all pages of the admin dashboard.
6767
#
68-
# def display_resource(user)
69-
# "User ##{user.id}"
70-
# end
68+
def display_resource(user)
69+
user.title
70+
end
7171
end

app/fields/file_size_field.rb

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# frozen_string_literal: true
2+
3+
require "administrate/field/base"
4+
5+
class FileSizeField < Administrate::Field::Base
6+
include ActionView::Helpers::NumberHelper
7+
8+
def to_s
9+
return "" if data.blank?
10+
11+
number_to_human_size(data.to_i)
12+
end
13+
end
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# frozen_string_literal: true
2+
3+
require "administrate/field/base"
4+
5+
class LastUpdatedByField < Administrate::Field::Base
6+
def to_s
7+
value = data.to_s.strip
8+
return "" if value.blank?
9+
10+
user = find_user(value)
11+
user ? user.title : value
12+
end
13+
14+
private
15+
16+
def find_user(value)
17+
return if value.blank?
18+
19+
if value.match?(/\A\d+\z/)
20+
user = User.find_by(id: value.to_i)
21+
return user if user
22+
end
23+
24+
User.find_by(email: value) || User.find_by(name: value)
25+
end
26+
end
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<div class="field-unit__label">
2+
<%= f.label field.attribute.upcase %>
3+
</div>
4+
<div class="field-unit__field">
5+
<%= f.text_field field.attribute, value: field.to_s, disabled: true %>
6+
</div>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<%= field.to_s %>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<%= field.to_s %>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<%= field.to_s %>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<%= field.to_s %>

app/views/fields/string/_form.html.erb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
<%= f.label field.attribute.upcase %>
33
</div>
44
<div class="field-unit__field">
5-
<%= if [:date_created_in_isilon, :file_checksum, :file_size, :file_type, :isilon_name,
6-
:isilon_path, :last_modified_in_isilon].include? field.attribute
7-
f.text_field field.attribute, readonly: true
5+
<%= if field.attribute == :full_path_with_volume
6+
f.text_field field.attribute, disabled: true
7+
elsif [:date_created_in_isilon, :file_checksum, :file_type, :isilon_name,
8+
:last_modified_in_isilon].include?(field.attribute)
9+
f.text_field field.attribute, readonly: true
810
else
911
f.text_field field.attribute
1012
end

0 commit comments

Comments
 (0)