set_team_admins [WIP]

seuros · seuros · commit ef630be27b4d · 2015-01-09T10:36:44.000Z
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
@@ -22,11 +22,10 @@ def followed
   def show
     #FIXME
     show_params = params.permit(:job_id, :refresh, :callback, :id, :slug)
+    @team = team_from_params(slug: show_params[:slug], id: show_params[:id])
 
     respond_to do |format|
       format.html do
-        @team = team_from_params(slug: show_params[:slug], id: show_params[:id])
-
         return render_404 if @team.nil?
 
         @team_protips = @team.trending_protips(4)
@@ -45,7 +44,6 @@ def show
         options[:force] = true if !show_params[:refresh].blank?
         response = Rails.cache.fetch(['v1', 'team', show_params[:id], :json], options) do
           begin
-            @team = team_from_params(slug: show_params[:slug], id: show_params[:id])
             @team.public_json
           rescue ActiveRecord::RecordNotFound
             return head(:not_found)
@@ -95,9 +93,8 @@ def create
   #end
 
   def edit
-    edit_params = params.permit(:slug, :id)
-
-    @team = team_from_params(slug: edit_params[:slug], id: edit_params[:id])
+    #TODO, change slug to citext
+    @team = Team.find_by_slug(params[:slug])
     return head(:forbidden) unless current_user.belongs_to_team?(@team) || current_user.admin?
     @edit_mode = true
     show
diff --git a/app/models/team.rb b/app/models/team.rb
@@ -613,11 +613,7 @@ def predominant
   def admin?(user)
     return false if user.nil?
     return true if user.admin?
-    if admins.empty?
-      members.include?(user)
-    else
-      admins.include?(user.id)
-    end
+    admins.pluck(:user_id).include?(user.id)
   end
 
   def timeline_key
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -375,12 +375,6 @@ def total_achievements
     badges_count
   end
 
-  def has_beta_access?
-    admin? || beta_access
-  end
-
-
-
   def to_csv
     [
       display_name,
diff --git a/app/views/teams/show.html.haml b/app/views/teams/show.html.haml
@@ -148,13 +148,4 @@
         .add-members-header
           %h3 Invite team members
         %h4 Email this link to your colleagues so they can join this team
-        =mail_to('', invite_to_team_url, :body => invite_to_team_url, :subject => "You've been invited to team #{@team.name}", :class => 'join-link')
-  -elsif viewing_my_team_while_unauthenticated?
-    #add-to-team.hide
-      .add-members-header
-        %h3 Add team members
-      %h4 Sign in to get an invite link to send to your colleagues
-      =link_to("Sign In", signin_path, :class => 'join-link record-exit', 'data-target-type' => 'signin')
-
--#-if signed_in? && current_user.try(:team) == @team
--#  =mail_to('teams@coderwall.com', "Is #{current_user.team.name} awesome and hiring? Upgrade to the new enhanced team profile now.", :subject => "Create an enhanced team profile on Coderwall", :body => "Company Name: #{current_user.try(:team).try(:name)}", :class => 'feature-signup track', 'data-action' => 'upgrade-from-my-team-page')
+        =mail_to('', invite_to_team_url, :body => invite_to_team_url, :subject => "You've been invited to team #{@team.name}", :class => 'join-link')
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -26,7 +26,7 @@
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Move cache dir's out of vagrant NFS directory
   config.cache_store                           = [:file_store,"/tmp/codewall-cache/"]
diff --git a/db/migrate/20150109101515_set_team_admins.rb b/db/migrate/20150109101515_set_team_admins.rb
@@ -0,0 +1,8 @@
+class SetTeamAdmins < ActiveRecord::Migration
+  def up
+    # doing that for teams with one member for now
+    Team.where(team_size: 1).find_each do |team|
+      team.members.first.update_attribute('role', 'admin')
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150109004213) do
+ActiveRecord::Schema.define(:version => 20150109101515) do
 
   add_extension "citext"
   add_extension "hstore"

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#`
`12`	`12`	`# It's strongly recommended to check this file into your version control system.`
`13`	`13`
`14`		`-ActiveRecord::Schema.define(:version => 20150109004213) do`
	`14`	`+ActiveRecord::Schema.define(:version => 20150109101515) do`
`15`	`15`
`16`	`16`	`add_extension "citext"`
`17`	`17`	`add_extension "hstore"`