From ff06549aba837a431ba57e931abd3bc214769f55 Mon Sep 17 00:00:00 2001
From: Mauricio Giacomini Girardello <mauriciogiacomini4@gmail.com>
Date: Thu, 3 Sep 2015 20:01:56 -0300
Subject: [PATCH] quick-fix small merges
---
app/controllers/search/solr_controller.rb | 6 +-----
app/views/layouts/application.html.erb | 8 --------
config/secrets.yml | 2 +-
3 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/app/controllers/search/solr_controller.rb b/app/controllers/search/solr_controller.rb
index 900b8f109..1306ee17e 100644
--- a/app/controllers/search/solr_controller.rb
+++ b/app/controllers/search/solr_controller.rb
@@ -8,11 +8,7 @@ class Search::SolrController < ApplicationController
@numFound = results["response"]["numFound"]
objectsFound1 = select_items_from_results(results)
- #h={}
- #ari=["a","b","c","d"]
- #h[0]=0 h[1]=1 h[2]=2 h[3]=3 h[4]=4
- #ari.each{|a| h[a] = 1}
- #@numFound =h.length
+
per_page=10
if(params[:paginacao])
per_page=params[:paginacao].to_i
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index fba2f1929..de6f18b5e 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -3,19 +3,11 @@
<head>
<title>ChartKickExample</title>
-<<<<<<< HEAD
<%= stylesheet_link_tag 'application', media: 'all' %>
<%= javascript_include_tag 'application' %>
<%= javascript_include_tag "http://www.google.com/jsapi", "chartkick" %>
<%= stylesheet_link_tag 'http://yandex.st/bootstrap/3.1.1/css/bootstrap.min.css' %>
<%= javascript_include_tag 'http://yandex.st/bootstrap/3.1.1/js/bootstrap.min.js' %>
-=======
- <%= stylesheet_link_tag 'application', media: 'all' %>
- <%= javascript_include_tag 'application' %>
- <!-- <%= javascript_include_tag "http://www.google.com/jsapi", "chartkick" %> -->
- <%= stylesheet_link_tag 'http://yandex.st/bootstrap/3.1.1/css/bootstrap.min.css' %>
- <%= javascript_include_tag 'http://yandex.st/bootstrap/3.1.1/js/bootstrap.min.js' %>
->>>>>>> d22d28d3c3ac90d8878b231fb35b7febd0050601
<%= csrf_meta_tags %>
<title>Portalmec</title>
diff --git a/config/secrets.yml b/config/secrets.yml
index ad4216222..cf60d11b4 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,7 +12,7 @@
development:
secret_key_base: 4f68c5b85e661ede15f8fd7c8a1a8b36e6d6f41033a23d2d25414feaa848f1e89d0337eb4e36501c5f2de84c98fbe255207c020beee17075f577192ebbcdaf5a
- dspace_host: https://portalmecdev.c3sl.ufpr.br:8443/rest
+ dspace_host: https://demo.dspace.org/rest
test:
secret_key_base: 6701dc9f54516df93c52b41a17eedc863ca0a18a75a11da5478c66127c40973888b38d2632ebe96d1a831ae336be57425c6d1f074501a081b55a0ea56898a582
--
GitLab