Skip to content
Snippets Groups Projects
Commit 38ba8f61 authored by Israel Barreto Sant'Anna's avatar Israel Barreto Sant'Anna
Browse files

Merged with master

parents b86f0570 d4b06a8b
No related branches found
No related tags found
No related merge requests found
......@@ -146,3 +146,23 @@ function HandleChangeImg()
var iminput = document.getElementById("pic");
// iminput.src = ;/*"path"+ fileinput.value;
}
//Correct bug Metadados Adicionais and Adicionar a coleção in firefox
function(e) {
var $this = $(this)
var href = $this.attr('href')
var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7
var option = $target.data('bs.modal') ? 'toggle' : $.extend({
remote: !/#/.test(href) && href
}, $target.data(), $this.data())
if ($this.is('a')) e.preventDefault()
$target.one('show.bs.modal', function(showEvent) {
if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown
$target.one('hidden.bs.modal', function() {
$this.is(':visible') && $this.trigger('focus')
})
})
Plugin.call($target, option, this)
}
......@@ -18,6 +18,7 @@ class GenericBuilder < Builder
if cache && !object[last_modified].blank?
o = Rails.cache.fetch(cache_key(object[id], object[last_modified]))
end
o = repository(object['class']).find object[id] if o.nil?
array << o
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment