added admin delete function

rbxbx · Aug 9, 2010 · c67b7c9 · c67b7c9
1 parent 7835aa3
commit c67b7c9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/app/controllers/remixes_controller.rb b/app/controllers/remixes_controller.rb
@@ -72,8 +72,12 @@ def destroy
 
     flash[:notice] = "Your track was successfully deleted."
 
-    @remix = Remix.find(:first, :conditions => {:id => params[:id], :user_id => current_user[:id]})
-    @remix.destroy
+    @remix = Remix.find(params[:id])
+
+    if current_user.uploaded(@remix) || current_user.admin?
+      @remix.destroy
+    end
+
     redirect_to(remixes_url)
 
   end

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -10,4 +10,8 @@ def uploaded(remix)
     remix.user_id == id ? true : false
   end
 
+  def admin?
+    SETTINGS["admin_id"].to_s == soundcloud_id ? true : false
+  end
+
 end
diff --git a/app/views/remixes/_remix.html.erb b/app/views/remixes/_remix.html.erb
@@ -11,13 +11,9 @@
 			Uploaded by <%= link_to remix.user.name, remix.user.permalink_url, :target => "_blank" -%> <%= time_ago_in_words remix.created_at -%> ago
 
 			<% if logged_in? %>
-
-			<% if current_user.uploaded(remix) %>
-
-			- <%= link_to 'Delete', remix, :confirm => 'Are you sure?', :method => :delete %>
-
-			<% end %>
-
+				<% if current_user.uploaded(remix) || current_user.admin? %>
+					- <%= link_to 'Delete', remix, :confirm => 'Are you sure?', :method => :delete %>
+				<% end %>
 			<% end %>
 
 		</div>

diff --git a/config/initializers/configure_remix.rb b/config/initializers/configure_remix.rb
@@ -4,4 +4,6 @@
 
 SETTINGS["group_id"] = HTTParty.get("http://api.soundcloud.com/resolve?url=#{SETTINGS["group"]}", :format => :xml)["group"]["id"]
 
+SETTINGS["admin_id"] = HTTParty.get("http://api.soundcloud.com/resolve?url=#{SETTINGS["admin"]}", :format => :xml)["user"]["id"]
+
 SETTINGS["instructions"] = File.read("#{RAILS_ROOT}/config/instructions.txt")
diff --git a/config/settings.yml b/config/settings.yml
@@ -7,7 +7,10 @@ description: SoundCloud remix contest. Submit your remix and vote on other remix
 # A link to your Terms, if needed. Leave blank, otherwise
 terms: 
 
-# Group on SoundCloud where remixes will be added 
+# URL to user on SoundCloud that will administer the remix app, e.g. http://soundcloud.com/leemartin
+admin: 
+
+# URL to group on SoundCloud where remixes will be added, e.g. http://soundcloud.com/groups/soundcloud-remix
 # You can start a new group here: http://soundcloud.com/groups/new
 group:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,6 @@

		SETTINGS["group_id"] = HTTParty.get("http://api.soundcloud.com/resolve?url=#{SETTINGS["group"]}", :format => :xml)["group"]["id"]

		SETTINGS["admin_id"] = HTTParty.get("http://api.soundcloud.com/resolve?url=#{SETTINGS["admin"]}", :format => :xml)["user"]["id"]

		SETTINGS["instructions"] = File.read("#{RAILS_ROOT}/config/instructions.txt")