diff --git a/app/admin/orga.rb b/app/admin/orga.rb index e6e50927..352fb387 100644 --- a/app/admin/orga.rb +++ b/app/admin/orga.rb @@ -5,16 +5,22 @@ ActiveAdmin.register Orga do scope :active scope :moderated scope :unmoderated + config.sort_order = 'updated_at_desc' + filter :kind, as: :check_boxes + filter :name + filter :region + index do column :kind column :name - column :url column :city column :department column :region - column :active + column :url + column :feed + column :contact column :updated_at actions end @@ -24,12 +30,18 @@ ActiveAdmin.register Orga do row :kind row :name row :description, as: :pagedown_text - row :url do - link_to l.url, l.url - end row :city row :department row :region + row :url do + link_to l.url, l.url + end + row :feed do + link_to l.feed, l.feed + end + row :contact do + mail_to l.contact, l.contact + end row :active end active_admin_comments @@ -39,11 +51,13 @@ ActiveAdmin.register Orga do f.inputs do f.input :kind f.input :name - f.input :description - f.input :url f.input :city f.input :department f.input :region + f.input :description + f.input :url + f.input :feed + f.input :contact f.input :active end f.actions diff --git a/app/views/orgas/show.text.haml b/app/views/orgas/show.text.haml index bcdf845e..8abd8bdc 100644 --- a/app/views/orgas/show.text.haml +++ b/app/views/orgas/show.text.haml @@ -1,13 +1,15 @@ ===================================================== -#{Orga.human_attribute_name(:kind).concat(':').ljust 12 } #{@orga.kind.name} -#{Orga.human_attribute_name(:name).concat(':').ljust 12 } #{@orga.name} -#{Orga.human_attribute_name(:region).concat(':').ljust 12 } #{@orga.region} -#{Orga.human_attribute_name(:url).concat(':').ljust 12 } #{@orga.url} -#{Orga.human_attribute_name(:feed).concat(':').ljust 12 } #{@orga.feed} -#{Orga.human_attribute_name(:contact).concat(':').ljust 12 } #{@orga.contact} -#{Orga.human_attribute_name(:submitter).concat(':').ljust 12} #{@orga.submitter} +#{Orga.human_attribute_name(:kind).concat(':').ljust 12 } #{@orga.kind.name} +#{Orga.human_attribute_name(:name).concat(':').ljust 12 } #{@orga.name} +#{Orga.human_attribute_name(:city).concat(':').ljust 12 } #{@orga.city} +#{Orga.human_attribute_name(:department).concat(':').ljust 12 } #{@orga.department} +#{Orga.human_attribute_name(:region).concat(':').ljust 12 } #{@orga.region} +#{Orga.human_attribute_name(:url).concat(':').ljust 12 } #{@orga.url} +#{Orga.human_attribute_name(:feed).concat(':').ljust 12 } #{@orga.feed} +#{Orga.human_attribute_name(:contact).concat(':').ljust 12 } #{@orga.contact} +#{Orga.human_attribute_name(:submitter).concat(':').ljust 12 } #{@orga.submitter} - if @orga.active.present? - #{Orga.human_attribute_name(:active).concat(':').ljust 12 } #{t @orga.active.to_s} + #{Orga.human_attribute_name(:active).concat(':').ljust 12 } #{t @orga.active.to_s} - unless @orga.description.blank? #{Orga.human_attribute_name(:description).concat(':').ljust 12} = wrap(strip_tags(@orga.description).gsub(/ /, '')).gsub /^/, ' '