From d2ba6d1f2269ce715e4132fe6f6496cc2e5246c8 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Mon, 14 Mar 2016 10:28:50 +0100
Subject: [PATCH 1/4] QA, removed not needed #app.

---
 app/assets/stylesheets/print.scss | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/print.scss b/app/assets/stylesheets/print.scss
index 684aa75a0..e9ff01dc1 100644
--- a/app/assets/stylesheets/print.scss
+++ b/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;
 }
 

From 845b87ceb0ecdd4e0b8a1742dad8aeaf1339cc49 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Mon, 14 Mar 2016 10:29:22 +0100
Subject: [PATCH 2/4] Use full width of config setting.

---
 app/assets/javascripts/app/views/settings/item.jst.eco | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/app/views/settings/item.jst.eco b/app/assets/javascripts/app/views/settings/item.jst.eco
index fa47874eb..b4b72d923 100644
--- a/app/assets/javascripts/app/views/settings/item.jst.eco
+++ b/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>
\ No newline at end of file

From c27aee75ebf56d4da332f7a22b65e10d4f914395 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Mon, 14 Mar 2016 10:46:37 +0100
Subject: [PATCH 3/4] Added ' for css selector to activate last used tab.

---
 .../app/controllers/_application_controller_generic.coffee    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee
index a37767ae8..50f586140 100644
--- a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee
+++ b/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')
 

From de56206045814618a9e38bb284c2ffea7846e4ce Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Mon, 14 Mar 2016 14:34:35 +0100
Subject: [PATCH 4/4] Deliver objects with associations in index list (like it
 is on show).

---
 app/controllers/application_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index cd24f1a39..97595bfd6 100644
--- a/app/controllers/application_controller.rb
+++ b/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