Skip to content

Commit

Permalink
removed tons of crap history-related
Browse files Browse the repository at this point in the history
ditched timeline. was cute but not worth it (too much specific code) and not compatible with touch devices
  • Loading branch information
bbenezech committed Nov 4, 2011
1 parent f2d9edd commit dff7e1e
Show file tree
Hide file tree
Showing 31 changed files with 106 additions and 740 deletions.
Binary file not shown.
Binary file not shown.
Binary file removed app/assets/images/rails_admin/timeline/handler.png
Binary file not shown.
217 changes: 0 additions & 217 deletions app/assets/javascripts/rails_admin/ra.timeline.js

This file was deleted.

1 change: 0 additions & 1 deletion app/assets/javascripts/rails_admin/rails_admin.js.erb
Expand Up @@ -11,7 +11,6 @@
require_asset 'rails_admin/ra.filtering-multiselect'
require_asset 'rails_admin/ra.filtering-select'
require_asset 'rails_admin/ra.remote-form'
require_asset 'rails_admin/ra.timeline'
require_asset 'rails_admin/ui'
require_asset "rails_admin/themes/#{theme}/ui"
require_asset 'rails_admin/custom/ui'
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/rails_admin/imports.css.scss.erb
Expand Up @@ -35,7 +35,6 @@ TODO :
@import "rails_admin/jquery.ui.timepicker";
@import "rails_admin/ra.calendar-additions";
@import "rails_admin/ra.filtering-multiselect";
@import "rails_admin/ra.timeline";

/*** Bootstrap Theming ***/

Expand Down
67 changes: 0 additions & 67 deletions app/assets/stylesheets/rails_admin/ra.timeline.css.scss

This file was deleted.

29 changes: 6 additions & 23 deletions app/controllers/rails_admin/history_controller.rb
@@ -1,35 +1,20 @@
module RailsAdmin
class HistoryController < RailsAdmin::ApplicationController
before_filter :get_model, :except => [:list, :slider]
before_filter :get_object, :except => [:list, :slider, :for_model]
before_filter :get_model, :except => [:list]
before_filter :get_object, :except => [:list, :for_model]

def list
@authorization_adapter.authorize(:history) if @authorization_adapter
if params[:month].nil? or params[:year].nil?
not_found
else
@month = params[:month].to_i
@year = params[:year].to_i
@history = AbstractHistory.history_for_month(@month, @year)
render :template => 'rails_admin/main/history', :layout => false
end
end

def slider
@authorization_adapter.authorize(:history) if @authorization_adapter
if params[:from].blank? or params[:to].blank?
not_found
else
render :json => AbstractHistory.history_summaries(params[:from], params[:to])
end
@history = History.all.limit(100)
render :template => 'rails_admin/main/history', :layout => false
end

def for_model
@authorization_adapter.authorize(:history) if @authorization_adapter
@page_type = @abstract_model.pretty_name.downcase
@page_name = t("admin.history.page_name", :name => @model_config.label.downcase)
@general = true
@history = AbstractHistory.history_for_model @abstract_model, params[:query], params[:sort], params[:sort_reverse], params[:all], params[:page]
@history = History.history_for_model(@abstract_model, params[:query], params[:sort], params[:sort_reverse], params[:all], params[:page])

render "show", :layout => request.xhr? ? false : 'rails_admin/application'
end
Expand All @@ -39,11 +24,9 @@ def for_object
@page_type = @abstract_model.pretty_name.downcase
@page_name = t("admin.history.page_name", :name => "#{@model_config.label.downcase} '#{@model_config.with(:object => @object).object_label}'")
@general = false

@history = AbstractHistory.history_for_object @abstract_model, @object, params[:query], params[:sort], params[:sort_reverse]
@history = History.history_for_object(@abstract_model, @object, params[:query], params[:sort], params[:sort_reverse], params[:all], params[:page])

render "show", :layout => request.xhr? ? false : 'rails_admin/application'
end

end
end

0 comments on commit dff7e1e

Please sign in to comment.