marty 0.5.15 → 0.5.16

data/app/components/marty/user_pivot.rb

@@ -1,128 +0,0 @@
-class Marty::UserPivot < Marty::PivotGrid
-  def configure(c)
-    super
-
-    c.title ||= I18n.t('users', default: "Users")
-    c.model = "Marty::User"
-
-    c.columns = [
-      :id,
-      :login,
-      :firstname,
-      :lastname,
-      :active,
-      :roles,
-    ]
-  end
-
-  js_configure do |c|
-
-    c.aggregate = [
-      {
-        data_index: 'id',
-        header:     'Sum of id',
-        aggregator: 'sum',
-      },
-      {
-        data_index: 'id',
-        header:     '# records',
-        aggregator: 'count',
-        align:      'right',
-        rederer:    <<-JS
-          Ext.util.Format.numberRenderer("0")
-        JS
-      },
-    ]
-
-    c.left_axis = [
-      {
-        data_index: 'firstname',
-        header:     'First Name',
-        sortable:   false
-      },
-      {
-        data_index: 'login',
-        header:     'Login',
-        sortable:   false
-      }
-    ]
-
-    c.top_axis = [
-      {
-        width:      120,
-        data_index: 'lastname'
-      }
-    ]
-
-    c.init_component = <<-JS
-    function() {
-      var me = this;
-      me.callParent();
-
-YYY = me;
-
-      var view = this.getView();
-
-      view.getSelectionModel().on('selectionchange', function(selModel) {
-        var has_sel = selModel.hasSelection();
-        var rec_id =
-          has_sel ? view.getSelectionModel().selected.first().getId() : null;
-XXX = view.getSelectionModel().selected.first();
-        console.log("Selection:", rec_id);
-      });
-    }
-    JS
-  end
-
-  def get_records(params)
-    require 'ostruct'
-
-    (1..10000).map {|i|
-      p = OpenStruct.new
-      p.id = i
-      p.login = (i % 5).to_s
-      p.firstname = (i % 21).to_s
-      p.lastname = (i % 10).to_s
-      p.active = (i%3 == 0)
-      p.roles = []
-      p
-    }
-  end
-
-  column :login do |c|
-    c.width = 100
-    c.text  = I18n.t("user_grid.login")
-  end
-
-  column :firstname do |c|
-    c.width = 100
-    c.text  = I18n.t("user_grid.firstname")
-  end
-
-  column :lastname do |c|
-    c.width = 100
-    c.text  = I18n.t("user_grid.lastname")
-  end
-
-  column :active do |c|
-    c.width = 60
-    c.text  = I18n.t("user_grid.active")
-  end
-
-  column :roles do |c|
-    c.width  = 100
-    c.flex   = 1
-    c.text   = I18n.t("user_grid.roles")
-    c.getter = lambda do |r|
-      r.roles.map { |ur| I18n.t("roles.#{ur.name}") }.sort
-    end
-  end
-
-  column :created_dt do |c|
-    c.text      = I18n.t("user_grid.created_dt")
-    c.format    = "Y-m-d H:i"
-    c.read_only = true
-  end
-end
-
-UserPivot = Marty::UserPivot

data/app/components/marty/user_view.rb~

@@ -1,188 +0,0 @@
-class Marty::UserView < Marty::CmGridPanel
-  has_marty_permissions	create: [:admin, :user_manager],
-			read: :any,
-			update: [:admin, :user_manager],
-			delete: [:admin, :user_manager]
-
-  def configure(c)
-    super
-
-    c.title ||= I18n.t('users', default: "Users")
-    c.model 			= "Marty::User"
-    c.enable_extended_search 	= false
-    c.enable_edit_inline	= false
-
-    c.columns ||= [:login,
-                   :firstname,
-                   :lastname,
-                   :active,
-                   :uuid,
-                   :roles
-                  ]
-
-    c.data_store.sorters = {
-      property: :login,
-      direction: 'ASC',
-    } if c.columns.include?(:login)
-  end
-
-  js_configure do |c|
-    c.init_component = <<-JS
-    function() {
-       this.callParent();
-       // Set single selection mode. FIXME: can this be done on config?
-       this.getSelectionModel().setSelectionMode('SINGLE');
-    }
-    JS
-  end
-
-  def self.set_roles(roles, user)
-    roles ||= []
-
-    # Destroy old roles (must call destroy for auditing to work properly)
-    user.user_roles.each do |ur|
-      ur.destroy unless roles.include?(I18n.t("roles.#{ur.role.name}"))
-    end
-
-    # set new roles
-    user.roles = Marty::Role.all.select { |r|
-      roles.include? I18n.t("roles.#{r.name}") }
-  end
-
-  def self.create_edit_user(data)
-    # Creates the initial place-holder user object and check it
-    # out.
-    user = data["id"].nil? ? Marty::User.new : Marty::User.find(data["id"])
-    user.login 	   = data["login"]
-    user.firstname = data["firstname"]
-    user.lastname  = data["lastname"]
-    user.active    = data["active"]
-    user.uuid      = data["uuid"]
-
-    if user.valid?
-      set_roles(data["roles"], user)
-      user.save
-    end
-
-    user
-  end
-
-  # override the add_in_form and edit_in_form endpoint. User creation/update
-  # needs to use the create_edit_user method.
-
-  endpoint :add_window__add_form__netzke_submit do |params, this|
-    data = ActiveSupport::JSON.decode(params[:data])
-    data["id"] = nil
-
-    unless self.class.can_perform_action?(:create)
-      this.netzke_feedback "Permission Denied"
-      return
-    end
-
-    user = self.class.create_edit_user(data)
-    if user.valid?
-      this.success = true
-      this.on_submit_success
-    else
-      data_adapter.errors_array(user).each do |error|
-        flash :error => error
-      end
-      this.netzke_feedback(@flash)
-    end
-  end
-
-  endpoint :edit_window__edit_form__netzke_submit do |params, this|
-    data = ActiveSupport::JSON.decode(params[:data])
-    unless self.class.can_perform_action?(:update)
-      this.netzke_feedback "Permission Denied"
-      return
-    end
-
-    user = self.class.create_edit_user(data)
-    if user.valid?
-      this.success = true
-      this.on_submit_success
-    else
-      data_adapter.errors_array(user).each do |error|
-        flash :error => error
-      end
-      this.netzke_feedback(@flash)
-    end
-  end
-
-  action :add_in_form do |a|
-    a.text 	= I18n.t("user_grid.new")
-    a.tooltip  	= I18n.t("user_grid.new")
-    a.icon 	= :user_add
-    a.disabled 	= !self.class.can_perform_action?(:create)
-  end
-
-  action :edit_in_form do |a|
-    a.disabled 	= !self.class.can_perform_action?(:update)
-    a.icon 	= :user_edit
-  end
-
-  action :del do |a|
-    a.icon	= :user_delete
-  end
-
-  def default_bbar
-    [:add_in_form, :edit_in_form, :del]
-  end
-
-  def default_context_menu
-    []
-  end
-
-  column :login do |c|
-    c.width 	= 100
-    c.text 	= I18n.t("user_grid.login")
-  end
-
-  column :firstname do |c|
-    c.width 	= 100
-    c.text 	= I18n.t("user_grid.firstname")
-  end
-
-  column :lastname do |c|
-    c.width 	= 100
-    c.text 	= I18n.t("user_grid.lastname")
-  end
-
-  column :active do |c|
-    c.width 	= 60
-    c.text 	= I18n.t("user_grid.active")
-  end
-
-  column :uuid do |c|
-    c.width 	= 60
-    c.text 	= I18n.t("user_grid.uuid")
-  end
-
-  column :roles do |c|
-    c.width 	= 100
-    c.flex 	= 1
-    c.editor = {
-      trigger_action: :all,
-      name: "roles",
-      attr_type: :string,
-      xtype: :combo,
-      store: Marty::Role.all.map { |r| I18n.t("roles.#{r.name}") }.sort,
-      empty_text: "Roles",
-      multi_select: true,
-    }
-
-    c.getter = lambda do |r|
-      r.roles.map { |ur| I18n.t("roles.#{ur.name}") }.sort
-    end
-  end
-
-  column :created_dt do |c|
-    c.text 	= I18n.t("user_grid.created_dt")
-    c.format 	= "Y-m-d H:i"
-    c.read_only = true
-  end
-
-end
-
-UserView = Marty::UserView

data/app/controllers/marty/application_controller.rb~

@@ -1,133 +0,0 @@
-class Marty::ApplicationController < ActionController::Base
-  # HACKKKKKKKKKKKKKKKKKKKKKKKKKKKK!!!
-  # protect_from_forgery
-
-  # Marty's ApplicationController is based on Redmine's
-  # implementation.
-
-  def handle_unverified_request
-    super
-    cookies.delete(:autologin)
-  end
-
-  before_filter :session_expiration,
-  :user_setup
-
-  def get_conf
-    Rails.configuration.marty
-  end
-
-  def session_expiration
-    if session[:user_id]
-      if session_expired? && !try_to_autologin
-        reset_session
-      else
-        session[:atime] = Time.now.utc.to_i
-      end
-    end
-  end
-
-  def session_expired?
-    session_lifetime, session_timeout =
-      get_conf.session_lifetime, get_conf.session_timeout
-
-    if session_lifetime
-      return true unless session[:ctime] &&
-        (Time.now.utc.to_i -
-         session[:ctime].to_i <= session_lifetime.to_i * 60)
-    end
-
-    if session_timeout
-      return true unless session[:atime] &&
-        (Time.now.utc.to_i - session[:atime].to_i <= session_timeout.to_i * 60)
-    end
-
-    false
-  end
-
-  def start_user_session(user)
-    session[:user_id] = user.id
-    session[:ctime] = Time.now.utc.to_i
-    session[:atime] = Time.now.utc.to_i
-  end
-
-  def user_setup
-    # Find the current user
-    user = Marty::User.current = find_current_user
-
-    logger.info("  Current user: #{user.login} (id=#{user.id})") if
-      logger && user
-  end
-
-  # Returns the current user or nil if no user is logged in
-  def find_current_user
-    user_id = session[:user_id]
-    if user_id
-      user = Marty::User.active.find(user_id) rescue nil
-    else
-      user = try_to_autologin
-    end
-
-    user
-  end
-
-  def try_to_autologin
-    if cookies[:autologin] && get_conf.autologin
-      # auto-login feature starts a new session
-      user = Marty::User.try_to_autologin(cookies[:autologin])
-      if user
-        reset_session
-        start_user_session(user)
-      end
-      user
-    end
-  end
-
-  # Sets the logged in user
-  def set_user(user)
-    reset_session
-    if user && user.is_a?(Marty::User)
-      Marty::User.current = user
-      start_user_session(user)
-    else
-      Marty::User.current = nil
-    end
-  end
-
-  # Logs out current user
-  def logout_user
-    if Marty::User.current
-      cookies.delete :autologin
-      Marty::Token.delete_all(["user_id = ?", Marty::User.current.id]) unless
-        Marty::Util.db_in_recovery?
-      self.set_user(nil)
-    end
-  end
-
-  def user_for_paper_trail
-    if Marty::User.current
-      Marty::User.current.login
-    else
-      'unknown'
-    end
-  end
-
-  def password_authentication
-    user = Marty::User.try_to_login(params[:username], params[:password])
-
-    user.nil? ? failed_authentication(params[:username] || 'nil username') :
-      successful_authentication(user)
-  end
-
-  def failed_authentication(login)
-      logger.info("Failed authentication for '#{login}' " +
-                  "from #{request.remote_ip} at #{Time.now.utc}")
-  end
-
-  def successful_authentication(user)
-    logger.info("Successful authentication for '#{user.login}' " +
-                "from #{request.remote_ip} at #{Time.now.utc}")
-    self.set_user(user)
-  end
-
-end