Skip to content
Snippets Groups Projects
Commit ff06549a authored by Mauricio Giacomini Girardello's avatar Mauricio Giacomini Girardello
Browse files

quick-fix small merges

parent aa9bfd3c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/controllers/search/solr_controller.rb
+ 1
− 5
View file @ ff06549a
...@@ -8,11 +8,7 @@ class Search::SolrController < ApplicationController ...@@ -8,11 +8,7 @@ class Search::SolrController < ApplicationController
@numFound = results["response"]["numFound"] @numFound = results["response"]["numFound"]
objectsFound1 = select_items_from_results(results) 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 per_page=10
if(params[:paginacao]) if(params[:paginacao])
per_page=params[:paginacao].to_i per_page=params[:paginacao].to_i
......
app/views/layouts/application.html.erb
+ 0
− 8
View file @ ff06549a
...@@ -3,19 +3,11 @@ ...@@ -3,19 +3,11 @@
<head> <head>
<title>ChartKickExample</title> <title>ChartKickExample</title>
<<<<<<< HEAD
<%= stylesheet_link_tag 'application', media: 'all' %> <%= stylesheet_link_tag 'application', media: 'all' %>
<%= javascript_include_tag 'application' %> <%= javascript_include_tag 'application' %>
<%= javascript_include_tag "http://www.google.com/jsapi", "chartkick" %> <%= javascript_include_tag "http://www.google.com/jsapi", "chartkick" %>
<%= stylesheet_link_tag 'http://yandex.st/bootstrap/3.1.1/css/bootstrap.min.css' %> <%= 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' %> <%= 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 %> <%= csrf_meta_tags %>
<title>Portalmec</title> <title>Portalmec</title>
......
config/secrets.yml
+ 1
− 1
View file @ ff06549a
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
development: development:
secret_key_base: 4f68c5b85e661ede15f8fd7c8a1a8b36e6d6f41033a23d2d25414feaa848f1e89d0337eb4e36501c5f2de84c98fbe255207c020beee17075f577192ebbcdaf5a secret_key_base: 4f68c5b85e661ede15f8fd7c8a1a8b36e6d6f41033a23d2d25414feaa848f1e89d0337eb4e36501c5f2de84c98fbe255207c020beee17075f577192ebbcdaf5a
dspace_host: https://portalmecdev.c3sl.ufpr.br:8443/rest dspace_host: https://demo.dspace.org/rest
test: test:
secret_key_base: 6701dc9f54516df93c52b41a17eedc863ca0a18a75a11da5478c66127c40973888b38d2632ebe96d1a831ae336be57425c6d1f074501a081b55a0ea56898a582 secret_key_base: 6701dc9f54516df93c52b41a17eedc863ca0a18a75a11da5478c66127c40973888b38d2632ebe96d1a831ae336be57425c6d1f074501a081b55a0ea56898a582
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment