Merge branch 'develop' of github.com:martini/zammad into develop

This commit is contained in:
Felix Niklas 2015-06-17 13:56:15 +02:00
commit 75838e5d8e
2 changed files with 12 additions and 1 deletions

View file

@ -78,7 +78,6 @@ class ArticleViewItem extends App.Controller
# check if rerender is needed # check if rerender is needed
return if !@hasChanged(@article) return if !@hasChanged(@article)
console.log('RERENDER', @ticket_article_id)
# prepare html body # prepare html body
if @article.content_type is 'text/html' if @article.content_type is 'text/html'
@article['html'] = @article.body @article['html'] = @article.body

View file

@ -0,0 +1,12 @@
class AddBaseIndexes < ActiveRecord::Migration
def change
add_index :users, [:organization_id]
add_index :roles_users, [:user_id]
add_index :roles_users, [:role_id]
add_index :groups_users, [:user_id]
add_index :groups_users, [:group_id]
add_index :organizations_users, [:user_id]
add_index :organizations_users, [:organization_id]
end
end