Merge branch 'feature/AGEND-56'

AyuntamientoMadrid · Apr 22, 2020 · c8686df · c8686df
2 parents 4d4a44e + 4956173
commit c8686df
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/app/controllers/admin/hidden_proposals_controller.rb b/app/controllers/admin/hidden_proposals_controller.rb
@@ -24,7 +24,7 @@ def confirm_hide
     if params[:tipo] == 'legislation_proposal'
       @proposals_legislation.confirm_hide
     else
-      @proposal.confirm_hide
+      @proposals.confirm_hide
     end
     redirect_to admin_hidden_proposals_path(params_strong)
   end
@@ -34,8 +34,8 @@ def restore
       @proposals_legislation.restore
       @proposals_legislation.ignore_flag
     else
-      @proposal.restore
-      @proposal.ignore_flag
+      @proposals.restore
+      @proposals.ignore_flag
     end
     Activity.log(current_user, :restore, @datos_comunes)
     redirect_to admin_hidden_proposals_path(params_strong)
@@ -48,8 +48,11 @@ def params_strong
   end
 
   def load_proposal
-    @proposals_legislation = Legislation::Proposal.with_hidden.find(params[:id])
-    @proposals = Proposal.with_hidden.find(params[:id])
+    if params[:tipo] == 'legislation_proposal'
+      @proposals_legislation = Legislation::Proposal.with_hidden.find(params[:id])
+    else
+      @proposals = Proposal.with_hidden.find(params[:id])
+    end
   end
 
   def load_resources

diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb
@@ -177,7 +177,7 @@ def self.search_by_title_or_id(title_or_id, results)
 
     def searchable_values
       { title              => "A",
-        author.username    => "B",
+        author.try(:username)    => "B",
         heading.try(:name) => "B",
         tag_list.join(" ") => "B",
         description        => "C"

diff --git a/app/models/debate.rb b/app/models/debate.rb
@@ -65,7 +65,7 @@ def self.recommendations(user)
 
   def searchable_values
     { title              => "A",
-      author.username    => "B",
+      author.try(:username)    => "B",
       tag_list.join(" ") => "B",
       geozone.try(:name) => "B",
       description        => "D"

diff --git a/app/models/legislation/proposal.rb b/app/models/legislation/proposal.rb
@@ -72,7 +72,7 @@ def to_param
 
   def searchable_values
     { title              => "A",
-      author.username    => "B",
+      author.try(:username) => "B",
       tag_list.join(" ") => "B",
       geozone.try(:name) => "B",
       summary            => "C",

diff --git a/app/models/proposal.rb b/app/models/proposal.rb
@@ -120,7 +120,7 @@ def to_param
 
   def searchable_values
     { title              => "A",
-      author.username    => "B",
+      author.try(:username)    => "B",
       tag_list.join(" ") => "B",
       geozone.try(:name) => "B",
       summary            => "C",