Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2016-11-04 16:03:48 +01:00
commit 824e674c64
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -1,6 +1,7 @@
# Changes # Changes
## Zammad 1.1.0 ## Zammad 1.1.0
- 2016-04-11 Implemented issue#[349](https://github.com/zammad/zammad/issues/349) - ticket search cache issue.
- 2016-10-28 Implemented issue#[317](https://github.com/zammad/zammad/issues/317) - Display origin url from tweet/facebook post in article view. - 2016-10-28 Implemented issue#[317](https://github.com/zammad/zammad/issues/317) - Display origin url from tweet/facebook post in article view.
## Zammad 1.0.1 ## Zammad 1.0.1

13
app/assets/javascripts/app/lib/app_post/global_search.coffee
View file

@ -16,12 +16,13 @@ class _globalSearchSingleton extends Spine.Module
query = params.query query = params.query
render = params.render render = params.render
limit = params.limit || 10 limit = params.limit || 10
cache_key = query + '_' + limit
# use cache for search result # use cache for search result
if @searchResultCache[query]
render(@searchResultCache[query].result)
currentTime = new Date currentTime = new Date
return if @searchResultCache[query].limit is limit && @searchResultCache[query].time > currentTime.setSeconds(currentTime.getSeconds() - 20) if @searchResultCache[cache_key] && @searchResultCache[cache_key].time > currentTime.setSeconds(currentTime.getSeconds() - 20)
render(@searchResultCache[cache_key].result)
return
App.Ajax.request( App.Ajax.request(
id: 'search' id: 'search'
@ -48,11 +49,11 @@ class _globalSearchSingleton extends Spine.Module
App.Log.error('_globalSearchSingleton', "No such model App.#{item.type}") App.Log.error('_globalSearchSingleton', "No such model App.#{item.type}")
diff = false diff = false
if @searchResultCache[query] if @searchResultCache[cache_key]
diff = difference(@searchResultCache[query].resultRaw, data.result) diff = difference(@searchResultCache[cache_key].resultRaw, data.result)
# cache search result # cache search result
@searchResultCache[query] = @searchResultCache[cache_key] =
result: result result: result
resultRaw: data.result resultRaw: data.result
limit: limit limit: limit