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

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

Browse source
This commit is contained in:
Felix Niklas 2016-03-14 15:57:47 +01:00
commit aa533af77c
4 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/controllers/_application_controller_generic.coffee
View file

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

2
app/assets/javascripts/app/views/settings/item.jst.eco
View file

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

16
app/assets/stylesheets/print.scss
View file

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

6
app/controllers/application_controller.rb
View file

@ -378,7 +378,11 @@ class ApplicationController < ActionController::Base
def model_index_render (object, _params) def model_index_render (object, _params)
generic_objects = object.all 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 rescue => e
logger.error e.message logger.error e.message
logger.error e.backtrace.inspect logger.error e.backtrace.inspect