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

app/assets/javascripts/app/controllers/_application_controller_generic.coffee

@@ -340,8 +340,8 @@ class App.ControllerTabs extends App.Controller
 
     # set last or first tab to active
     @lastActiveTab = @Config.get('lastTab')
-    if @lastActiveTab &&  @$(".nav-tabs li a[href=#{@lastActiveTab}]")[0]
-      @$(".nav-tabs li a[href=#{@lastActiveTab}]").tab('show')
+    if @lastActiveTab &&  @$(".nav-tabs li a[href='#{@lastActiveTab}']")[0]
+      @$(".nav-tabs li a[href='#{@lastActiveTab}']").tab('show')
     else
       @$('.nav-tabs li:first a').tab('show')
 

app/assets/javascripts/app/views/settings/item.jst.eco

@@ -2,7 +2,7 @@
   <h2><%- @T( @setting.title ) %></h2>
   <p class="help-text"><%- @RichText( @setting.description ) %></p>
   <div class="horizontal end">
-    <div class="form-item"></div>
+    <div class="form-item flex"></div>
     <button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
   </div>
 </form>

app/assets/stylesheets/print.scss

@@ -1,12 +1,12 @@
 #app > *:not(.content):not(.active),
 #app > .hide,
-#app .icon,
-#app .btn,
-#app .avatar {
+.icon,
+.btn,
+.avatar {
   display: none;
 }
 
-#app .table {
+.table {
   margin: 1em 0;
   border: 1px solid;
   padding: 1em;
@@ -19,7 +19,7 @@
 
 */
 
-#app .dashboard + .sidebar {
+.dashboard + .sidebar {
   display: none;
 }
 
@@ -30,9 +30,9 @@
 
 */
 
-#app .bulkAction,
-#app .overviews .checkbox-replacement,
-#app .overviews .overview-header {
+.bulkAction,
+.overviews .checkbox-replacement,
+.overviews .overview-header {
   display: none;
 }
 

app/controllers/application_controller.rb

@@ -378,7 +378,11 @@ class ApplicationController < ActionController::Base
 
   def model_index_render (object, _params)
     generic_objects = object.all
-    model_index_render_result(generic_objects)
+    generic_objects_with_associations = []
+    generic_objects.each {|item|
+      generic_objects_with_associations.push item.attributes_with_associations
+    }
+    model_index_render_result(generic_objects_with_associations)
   rescue => e
     logger.error e.message
     logger.error e.backtrace.inspect