From 56f1e19f67d2d9dcab0067ec667f9ac3ffb8e4ed Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Tue, 9 Apr 2013 18:05:23 -0400
Subject: [PATCH] fixes #1209

---
 app/controllers/users_controller.rb          |  6 ------
 app/logical/uploaded_tags_importer.rb        | 20 --------------------
 app/views/users/edit.html.erb                |  2 +-
 app/views/users/restore_uploaded_tags.js.erb |  1 -
 config/routes.rb                             |  1 -
 5 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 app/logical/uploaded_tags_importer.rb
 delete mode 100644 app/views/users/restore_uploaded_tags.js.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 23791e577..684fde00b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -66,12 +66,6 @@ class UsersController < ApplicationController
     render :nothing => true
   end
 
-  def restore_uploaded_tags
-    @user = User.find(params[:id])
-    importer = UploadedTagsImporter.new(@user)
-    importer.import!
-  end
-
 private
   def check_privilege(user)
     raise User::PrivilegeError unless (user.id == CurrentUser.id || CurrentUser.is_admin?)
diff --git a/app/logical/uploaded_tags_importer.rb b/app/logical/uploaded_tags_importer.rb
deleted file mode 100644
index c9b99e9bb..000000000
--- a/app/logical/uploaded_tags_importer.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class UploadedTagsImporter
-  attr_reader :user
-
-  def initialize(user)
-    @user = user
-  end
-
-  def import!
-    row = connection.exec("SELECT uploaded_tags FROM users WHERE id = #{user.id}").first
-    if row
-      user.update_attribute(:favorite_tags, row["uploaded_tags"])
-    end
-    connection.close
-  rescue Exception
-  end
-
-  def connection
-    @connection ||= PGconn.connect(:dbname => "danbooru", :host => "dbserver", :user => "albert")
-  end
-end
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index a238b698c..f6681dd33 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -29,7 +29,7 @@
         <div class="input text optional field_with_hint">
           <label class="text optional" for="user_favorite_tags">Favorite tags</label>
           <textarea id="user_favorite_tags" class="text optional" rows="5" name="user[favorite_tags]" cols="40"><%= raw @user.favorite_tags %></textarea>
-          <span class="hint">A list of whitespace delimited tags that show up in your profile. <%= link_to "Restore from old database", restore_uploaded_tags_user_path(@user), :method => :post, :remote => true %></span>
+          <span class="hint">A list of whitespace delimited tags that show up in your profile.</span>
         </div> 
       </fieldset>
       
diff --git a/app/views/users/restore_uploaded_tags.js.erb b/app/views/users/restore_uploaded_tags.js.erb
deleted file mode 100644
index 75f478ea2..000000000
--- a/app/views/users/restore_uploaded_tags.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-$("#user_favorite_tags").val(<%= raw @user.favorite_tags.to_json %>);
diff --git a/config/routes.rb b/config/routes.rb
index e8f6e47c6..8347591c9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -192,7 +192,6 @@ Danbooru::Application.routes.draw do
     member do
       delete :cache
       post :upgrade
-      post :restore_uploaded_tags
     end
   end
   resources :user_feedbacks