From 04dfa535c81319ebab737db9cf90ae0275c01c37 Mon Sep 17 00:00:00 2001 From: Renzo Date: Sun, 14 Aug 2016 15:17:44 -0500 Subject: [PATCH] Fixed fix #192 --- app/controllers/TagSubscriptionController.php | 18 +++++++++--------- app/models/TagSubscription.php | 12 ------------ 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/app/controllers/TagSubscriptionController.php b/app/controllers/TagSubscriptionController.php index 45f1f89..386cbdc 100755 --- a/app/controllers/TagSubscriptionController.php +++ b/app/controllers/TagSubscriptionController.php @@ -10,21 +10,21 @@ class TagSubscriptionController extends ApplicationController ] ]; } - + public function create() { $this->response()->headers()->setContentType('text/javascript'); $this->setLayout(false); - + if ($this->request()->isPost()) { if (current_user()->tag_subscriptions->size() >= CONFIG()->max_tag_subscriptions) { $this->tag_subscription = null; } else { - $this->tag_subscription = TagSubscription::create(['user_id' => current_user()->id, 'tag_query' => '']); + $this->tag_subscription = TagSubscription::create(['user_id' => current_user()->id, 'tag_query' => '', 'name' => 'new tagsub']); } } } - + public function update() { if ($this->request()->isPost()) { @@ -37,24 +37,24 @@ class TagSubscriptionController extends ApplicationController } } } - + $this->notice("Tag subscriptions updated"); $this->redirectTo('user#edit'); } - + public function index() { $this->tag_subscriptions = current_user()->tag_subscriptions; } - + public function destroy() { $this->response()->headers()->setContentType('text/javascript'); $this->setLayout(false); - + if ($this->request()->isPost()) { $this->tag_subscription = TagSubscription::find($this->params()->id); - + if (current_user()->has_permission($this->tag_subscription)) { $this->tag_subscription->destroy(); } diff --git a/app/models/TagSubscription.php b/app/models/TagSubscription.php index a97fcf8..c1a7884 100755 --- a/app/models/TagSubscription.php +++ b/app/models/TagSubscription.php @@ -110,16 +110,4 @@ class TagSubscription extends Rails\ActiveRecord\Base } } } - - protected function validations() - { - return [ - 'name' => [ - 'length' => ['minimum' => 1] - ], - 'tag_query' => [ - 'length' => ['minimum' => 1] - ], - ]; - } }