Removes show_hidden and secret_name

app/controllers/activities_controller.rb

@@ -117,6 +117,6 @@ class ActivitiesController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def activity_params
-      params.require(:activity).permit(:public_name, :secret_name, :description, :location, :start, :end, :deadline, :show_hidden)
+      params.require(:activity).permit(:public_name, :description, :location, :start, :end, :deadline)
     end
 end

app/models/activity.rb

@@ -3,14 +3,7 @@
 class Activity < ApplicationRecord
   # @!attribute public_name
   #   @return [String]
-  #     the name that users will see if there is no {#secret_name}, or if
-  #     {#show_hidden} is `false`.
-  #
-  # @!attribute secret_name
-  #   @return [String]
-  #     a name that is (be default) only visible to organizers and group
-  #     leaders.  Can be shown or hidden to normal participants using
-  #     {#show_hidden}.
+  #     a short name for the activity.
   #
   # @!attribute description
   #   @return [String]
@@ -22,13 +15,6 @@ class Activity < ApplicationRecord
   #     a short text describing where the activity will take place. Always
   #     visible to all participants.
   #
-  # @!attribute show_hidden
-  #   @return [Boolean]
-  #     Whether or not the 'secret' attributes can be viewed by the people who
-  #     aren't organizers or group leaders. Currently, only {#secret_name} is
-  #     influenced by this. More attributes may be added in the future, and
-  #     will be controlled by this toggle as well.
-  #
   # @!attribute start
   #   @return [TimeWithZone]
   #     when the activity starts.

app/views/activities/_form.html.erb

@@ -13,16 +13,8 @@
 
   <div class="actions">
     <div class="form-group">
-      <div class="row">
-        <div class="col-md-6">
-          <%= f.label :public_name %>
-          <%= f.text_field :public_name, class: 'form-control' %>
-        </div>
-        <div class="col-md-6">
-          <%= f.label :secret_name %>
-          <%= f.text_field :secret_name, class: 'form-control' %>
-        </div>
-      </div>
+      <%= f.label :public_name %>
+      <%= f.text_field :public_name, class: 'form-control' %>
     </div>
     <div class="form-group">
       <div class="row">
@@ -44,10 +36,6 @@
       <%= f.label :deadline %>
       <%= f.datetime_field :deadline, class: 'form-control' %>
     </div>
-    <div class="form-group">
-      <%= f.label :show_hidden %>
-      <%= f.check_box :show_hidden %>
-    </div>
     <%= f.submit %>
   </div>
 <% end %>

app/views/dashboard/home.html.haml

@@ -27,9 +27,6 @@
                   %tr{class: p.row_class, data: {activity_id: e.id, person_id: current_person.id}}
                     %td
                       = e.public_name
-                      - if e.secret_name && e.participants.first.is_organizer
-                        %i
-                          = "(#{e.secret_name})"
                     %td
                       = e.group.name
                     %td
@@ -67,8 +64,6 @@
                   %td
                     = link_to group_activity_url(a.group, a) do
                       = a.public_name
-                      - if a.secret_name
-                        = "(#{a.secret_name})"
                       = render partial: "activities/state_counts", locals: {counts: a.state_counts}
 
   .row

db/migrate/20170815155155_remove_secret_name_from_activity.rb

@@ -0,0 +1,13 @@
+class RemoveSecretNameFromActivity < ActiveRecord::Migration[5.0]
+  def up
+    remove_column :activities, :secret_name
+    remove_column :activities, :show_hidden
+    rename_column :activities, :public_name, :name
+  end
+
+  def down
+    rename_column :activities, :name, :public_name
+    add_column :activities, :secret_name, :string
+    add_column :activities, :show_hidden, :boolean
+  end
+end

db/schema.rb

@@ -10,17 +10,15 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170222104408) do
+ActiveRecord::Schema.define(version: 20170815155155) do
 
   create_table "activities", force: :cascade do |t|
-    t.string   "public_name"
-    t.string   "secret_name"
+    t.string   "name"
     t.string   "description"
     t.string   "location"
     t.datetime "start"
     t.datetime "end"
     t.datetime "deadline"
-    t.boolean  "show_hidden"
     t.integer  "group_id"
     t.datetime "created_at",  null: false
     t.datetime "updated_at",  null: false

db/seeds.rb

@@ -52,37 +52,27 @@ end
 
 a = Activity.create!(
   public_name: 'Fikkie stoken ofzo',
-  secret_name: 'Bosbrandopkomst',
   description: 'Een scout trekt er samen met anderen op uit',
   location: 'In het bos in het bos',
   start: 4.weeks.since,
   end: 4.weeks.since + 2.hours,
   deadline: 3.weeks.since,
-  show_hidden: false,
   group: g
 )
 
 Group.all.each do |g|
   10.times do |i|
-    if Faker::Boolean.boolean(0.25)
-      secret_name = Faker::Hacker.ingverb
-    else
-      secret_name = nil
-    end
-
     starttime = Faker::Time.between(DateTime.now, 1.years.since, :morning)
     endtime   = Faker::Time.between(1.hours.since(starttime), 1.days.since(starttime), :afternoon)
     deadline  = 5.days.ago(starttime)
 
     act = Activity.create!(
       public_name: Faker::Hacker.ingverb,
-      secret_name: secret_name,
       description: Faker::Hipster.sentence,
       location: Faker::Address.city,
       start: starttime,
       end: endtime,
       deadline: deadline,
-      show_hidden: Faker::Boolean.boolean,
       group: g
     )
   end