2:21 a.m.
[PATCH aggregator 1/7] Integration of rack-restful_submit
[PATCH aggregator 2/7] Add the Resource Management -> Pools page
[PATCH aggregator 3/7] Moving users into admin/users (first pass).
[PATCH aggregator 4/7] Small refactoring of application controller.
[PATCH aggregator 5/7] Support new UI in Cucumber.
[PATCH aggregator 6/7] Fixing broken tests and business logic for clouds/pools.
[PATCH aggregator 7/7] New Rack::RestfulSubmit version
2:21 a.m.
New subject: [PATCH aggregator 1/7] Integration of rack-restful_submit
From: Ladislav Martincik <lmartinc(a)redhat.com>
---
src/app/helpers/application_helper.rb | 4 +-
src/spec/helpers/application_helper_spec.rb | 37 +++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 2 deletions(-)
create mode 100644 src/spec/helpers/application_helper_spec.rb
diff --git a/src/app/helpers/application_helper.rb
b/src/app/helpers/application_helper.rb
index 37330cb..456a02e 100644
--- a/src/app/helpers/application_helper.rb
+++ b/src/app/helpers/application_helper.rb
@@ -184,10 +184,10 @@ module ApplicationHelper
# <tt>restful_submit_tag('Delete', 'destroy',
instance_path(@instance), 'DELETE')</tt>
#
# Learn more: https://github.com/martincik/rack-restful_submit
- def restful_submit_tag(value, action, url, method)
+ def restful_submit_tag(value, action, url, method, options = {})
hidden_field_tag("__map[#{action}][url]", url) <<
hidden_field_tag("__map[#{action}][method]", method.upcase) <<
- submit_tag(value, :name => "__rewrite[#{action}]")
+ submit_tag(value, {:name =>
"__rewrite[#{action}]"}.reverse_merge!(options))
end
end
diff --git a/src/spec/helpers/application_helper_spec.rb
b/src/spec/helpers/application_helper_spec.rb
new file mode 100644
index 0000000..fe5c956
--- /dev/null
+++ b/src/spec/helpers/application_helper_spec.rb
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe ApplicationHelper do
+ include ApplicationHelper
+
+ context "restful_submit_tag() helper" do
+
+ it "contains mapping as hidden fields" do
+ html = restful_submit_tag('Delete', 'destroy',
'destroy_url', 'DELETE')
+ doc = Nokogiri::HTML(html)
+ nodes = (doc/"input[@type='hidden']")
+
+ nodes.each do |node|
+ ['__map[destroy][url]',
'__map[destroy][method]'].include?(node['name']).should be_true
+ end
+ end
+
+ it "with no options" do
+ html = restful_submit_tag('Delete', 'destroy',
'destroy_url', 'DELETE')
+ doc = Nokogiri::HTML(html)
+ node = (doc/"input[@type='submit']")
+
+ node.first['name'].should == '__rewrite[destroy]'
+ end
+
+ it "with options" do
+ html = restful_submit_tag('Delete', 'destroy',
'destroy_url', 'DELETE', :id => 'delete', :name =>
'test')
+ doc = Nokogiri::HTML(html)
+ node = (doc/"input[@type='submit']")
+
+ node.first['name'].should == '__rewrite[destroy]'
+ node.first['id'].should == 'delete'
+ end
+
+ end
+
+end
--
1.7.3.2
2:21 a.m.
New subject: [PATCH aggregator 2/7] Add the Resource Management -> Pools page
From: Tomas Sedovic <tsedovic(a)redhat.com>
This is the first step towards implementing the Pools page in the new UI.
Actions `index` and `show` are in place and display the proper pages (though
the content is pretty much still missing).
The "New Pool" button is working; the "Edit" one is hooked up to the
Controller and has some basic code but the functionality is not there yet.
When you click on the pool name, you will see the "Details" pane with the
appropriate tabs. The contents of the tabs are missing as well.
---
src/app/controllers/resources/pools_controller.rb | 59 +++++++++++++++++++++
src/app/models/pool.rb | 1 +
src/app/stylesheets/newui.scss | 21 +++++--
src/app/views/layouts/newui.haml | 10 ++--
src/app/views/resources/pools/_list.haml | 23 ++++++++
src/app/views/resources/pools/index.haml | 3 +-
src/app/views/resources/pools/new.haml | 11 ++++
src/app/views/resources/pools/show.haml | 24 ++++++++
8 files changed, 141 insertions(+), 11 deletions(-)
create mode 100644 src/app/views/resources/pools/_list.haml
create mode 100644 src/app/views/resources/pools/new.haml
create mode 100644 src/app/views/resources/pools/show.haml
diff --git a/src/app/controllers/resources/pools_controller.rb
b/src/app/controllers/resources/pools_controller.rb
index 39d3b7c..426e016 100644
--- a/src/app/controllers/resources/pools_controller.rb
+++ b/src/app/controllers/resources/pools_controller.rb
@@ -1,6 +1,65 @@
class Resources::PoolsController < ApplicationController
before_filter :require_user
+ before_filter :load_pools, :only => [:index, :show]
def index
end
+
+ def show
+ @pool = Pool.find(params[:id])
+ end
+
+ def edit
+ render :text => "Edit Pool #{params[:id]}"
+ end
+
+ def new
+ require_privilege(Privilege::POOL_MODIFY)
+ @pool = Pool.new
+ end
+
+ def create
+ require_privilege(Privilege::POOL_MODIFY)
+
+ @pool = Pool.new(params[:pool])
+ quota = Quota.new
+ quota.save!
+
+ @pool.quota_id = quota.id
+ @pool.zone = Zone.default
+ if @pool.save
+ flash[:notice] = "Pool added."
+ redirect_to :action => 'show', :id => @pool.id
+ else
+ render :action => :new
+ end
+ end
+
+ def edit
+ selected_pools = params[:pool][:selected].reject {|id, checked| checked ==
'0'}
+ if selected_pools.size != 1
+ flash[:notice] = "Select a single pool."
+ redirect_to :action => 'index'
+ else
+ pool_id = selected_pools.first[0]
+ @pool = Pool.find(pool_id)
+ render :text => "Editing pool '#{(a)pool.name}'"
+ end
+ end
+
+ protected
+
+ def load_pools
+ @header = [
+ { :name => "Pool name", :sort_attr => :name },
+ { :name => "% Quota used", :sortable => false },
+ { :name => "Quota (Instances)", :sort_attr =>
"quotas.total_instances"},
+ { :name => "Zone", :sort_attr => "zones.name" }
+ ]
+ @pools = Pool.paginate(:all, :include => [ :quota, :zone ],
+ :page => params[:page] || 1,
+ :order => (params[:order_field] || 'name') +' '+
(params[:order_dir] || 'asc')
+ )
+ @url_params = params.clone
+ end
end
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index 597128b..32783d8 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -32,6 +32,7 @@ class Pool < ActiveRecord::Base
validates_presence_of :name
validates_presence_of :zone
+ validates_uniqueness_of :name
validates_uniqueness_of :exported_as, :if => :exported_as
validates_format_of :name, :with => /^[\w -]*$/n, :message => "must only
contain: numbers, letters, spaces, '_' and '-'"
diff --git a/src/app/stylesheets/newui.scss b/src/app/stylesheets/newui.scss
index 5b341bd..933165d 100644
--- a/src/app/stylesheets/newui.scss
+++ b/src/app/stylesheets/newui.scss
@@ -1329,25 +1329,34 @@ a.iconbutton {
}
+
+$details-height: 190px;
+$content-left: 180px;
+
#list-view {
border: 1px solid;
padding: 1em;
position: absolute;
top: 1em;
- left: 15em;
+ left: $content-left;
right: 0;
- bottom: 320px;
overflow: auto;
+ &.part {
+ bottom: $details-height + 30px;
+ }
+ &.full {
+ bottom: 1em;
+ }
}
#details-view {
border: 1px solid;
position: absolute;
- left: 15em;
+ left: $content-left;
right: 0;
- height: 270px;
- bottom: 1em;
- padding: 1em;
+ height: $details-height;
+ bottom: 0;
+ padding: 0;
}
/* DEBUG GRID */
diff --git a/src/app/views/layouts/newui.haml b/src/app/views/layouts/newui.haml
index 664cf1f..26a0a48 100644
--- a/src/app/views/layouts/newui.haml
+++ b/src/app/views/layouts/newui.haml
@@ -38,13 +38,15 @@
= render_navigation({:context => 'new', :expand_all => true,
:level => 1})
= render_navigation({:context => 'new', :expand_all => true,
:level => 2})
#content
- = render :partial => '/layouts/notification'
#saved-searches
Saved searches
- #list-view
+ - details = !(yield :details).blank?
+ #list-view{ :class => details ? 'part' : 'full'}
+ = render :partial => '/layouts/notification'
= (yield :list or yield)
- #details-view
- = yield :details
+ - if details
+ #details-view
+ = yield :details
%footer
= render :partial => "layouts/footer"
#grid
diff --git a/src/app/views/resources/pools/_list.haml
b/src/app/views/resources/pools/_list.haml
new file mode 100644
index 0000000..6d1e4db
--- /dev/null
+++ b/src/app/views/resources/pools/_list.haml
@@ -0,0 +1,23 @@
+- form_tag do |f|
+ = restful_submit_tag "New Pool", "new", new_resources_pool_path,
'GET'
+ = restful_submit_tag "Edit", "edit",
edit_resources_pool_path((a)pools.first), 'GET'
+ %p
+ Select:
+ = link_to "All", @url_params.merge(:select => 'all')
+ %span> ,
+ = link_to "None", @url_params.merge(:select => 'none')
+ %table
+ = sortable_table_header @header
+ - @pools.each do |pool|
+ %tr
+ %td
+ - selected = @url_params[:select] == 'all'
+ = check_box(:pool, "selected[#{pool.id}]", :checked => selected)
+ = link_to pool.name, resources_pool_path(pool)
+ %td
+ =((pool.quota.maximum_running_instances || 0)/100)*pool.quota.total_instances
+ ='%'
+ %td
+ =pool.quota.total_instances
+ %td
+ =pool.zone.name
diff --git a/src/app/views/resources/pools/index.haml
b/src/app/views/resources/pools/index.haml
index 5716106..62ccbc6 100644
--- a/src/app/views/resources/pools/index.haml
+++ b/src/app/views/resources/pools/index.haml
@@ -1 +1,2 @@
-resources/pools/index.haml
+- content_for :list do
+ = render :partial => 'list'
diff --git a/src/app/views/resources/pools/new.haml
b/src/app/views/resources/pools/new.haml
new file mode 100644
index 0000000..032f0ac
--- /dev/null
+++ b/src/app/views/resources/pools/new.haml
@@ -0,0 +1,11 @@
+= error_messages_for 'account'
+%h1 Create a new Pool
+- form_for @pool, :url => resources_pools_path do |form|
+ %h2 Pool
+ %fieldset
+ %label.grid_2.alpha Name:
+ = form.text_field :name, :class => "grid_5"
+ = form.error_message_on :name, 'Name '
+ .clear.grid_14.prefix_2.alpha Provide a descriptive name for this pool.
+
+ = submit_tag "Save", :class => "submit formbutton"
diff --git a/src/app/views/resources/pools/show.haml
b/src/app/views/resources/pools/show.haml
new file mode 100644
index 0000000..b28cc48
--- /dev/null
+++ b/src/app/views/resources/pools/show.haml
@@ -0,0 +1,24 @@
+- content_for :list do
+ = render :partial => 'list'
+
+- content_for :details do
+ %ul
+ %li
+ = link_to 'Properties', '#properties'
+ %li
+ = link_to 'Deployments', '#deployments'
+ %li
+ = link_to 'Instances', '#instances'
+ %li
+ = link_to 'History', '#history'
+ %li
+ = link_to 'Permissions', '#permissions'
+ %h3
+ Details for
+ = @pool.name
+
+- content_for :scripts do
+ :javascript
+ $(document).ready(function() {
+ $('#details-view').tabs();
+ });
--
1.7.3.2
2:21 a.m.
New subject: [PATCH aggregator 3/7] Moving users into admin/users (first pass).
From: Ladislav Martincik <lmartinc(a)redhat.com>
---
src/app/controllers/admin/users_controller.rb | 98 ++++++++++++++++++++++++-
src/app/services/application_service.rb | 6 +-
src/app/stylesheets/newui.scss | 1 +
src/app/views/admin/users/_form.haml | 44 +++++++++++
src/app/views/admin/users/_list.haml | 42 +++++++++++
src/app/views/admin/users/edit.haml | 7 ++
src/app/views/admin/users/index.haml | 3 +-
src/app/views/admin/users/new.haml | 6 ++
src/app/views/admin/users/show.haml | 99 +++++++++++++++++++++++++
src/config/routes.rb | 3 +-
src/features/step_definitions/user_steps.rb | 2 +-
src/features/support/paths.rb | 2 +-
src/features/user.feature | 11 ++-
13 files changed, 312 insertions(+), 12 deletions(-)
create mode 100644 src/app/views/admin/users/_form.haml
create mode 100644 src/app/views/admin/users/_list.haml
create mode 100644 src/app/views/admin/users/edit.haml
create mode 100644 src/app/views/admin/users/new.haml
create mode 100644 src/app/views/admin/users/show.haml
diff --git a/src/app/controllers/admin/users_controller.rb
b/src/app/controllers/admin/users_controller.rb
index 591edad..65b1ce6 100644
--- a/src/app/controllers/admin/users_controller.rb
+++ b/src/app/controllers/admin/users_controller.rb
@@ -1,6 +1,102 @@
class Admin::UsersController < ApplicationController
before_filter :require_user
+ before_filter :only_admin, :only => [:index, :multi_destroy]
+ before_filter :load_users, :only => [:index, :show]
- def index
+ def new
+ @user = User.new
+ @user.quota = Quota.new
end
+
+ def create
+ if params[:commit] == "Reset"
+ redirect_to :action => 'new' and return
+ end
+
+ # TODO: Shouldn't it be if current_user.nil? instead?
+ require_privilege(Privilege::USER_MODIFY) unless current_user.nil?
+ @user = User.new(params[:user])
+
+ @registration = RegistrationService.new(@user)
+ unless @registration.save
+ flash.now[:warning] = "User registration failed: #{(a)registration.error}"
+ render :action => 'new' and return
+ end
+
+ if current_user
+ flash[:notice] = "User registered!"
+ redirect_to admin_users_url
+ else
+ flash[:notice] = "You have successfully registered!"
+ redirect_to dashboard_url
+ end
+ end
+
+ def show
+ @user = User.find_by_id(params[:id]) || current_user
+ @quota_resources = @user.quota.quota_resources
+ end
+
+ def edit
+ @user = User.find_by_id(params[:id]) || current_user
+
+ if cannot_modify_different_user?(@user)
+ flash[:notice] = "Invalid Permission to perform this operation"
+ redirect_to dashboard_url and return
+ end
+ end
+
+ def update
+ @user = User.find_by_id(params[:id]) || current_user
+
+ if params[:commit] == "Reset"
+ redirect_to edit_admin_user_url(@user) and return
+ end
+
+ redirect_to dashboard_url and return unless @user
+
+ if cannot_modify_different_user = cannot_modify_different_user?(@user)
+ flash[:notice] = "Invalid Permission to perform this operation"
+ redirect_to dashboard_url and return
+ end
+
+ unless @user.update_attributes(params[:user])
+ render :action => 'edit' and return
+ else
+ flash[:notice] = "User updated!"
+ redirect_to cannot_modify_different_user ? dashboard_url : admin_users_url
+ end
+ end
+
+ def multi_destroy
+ User.destroy(params[:user_selected])
+ redirect_to admin_users_url
+ end
+
+ protected
+
+ def load_users
+ @users = User.all
+ sort_order = params[:sort_by].nil? ? "login" : params[:sort_by]
+ # TODO: (lmartinc) Optimize this sort! hell!
+ if sort_order == "percentage_quota_used"
+ @users.sort! {|x,y| y.quota.percentage_used <=> x.quota.percentage_used }
+ elsif sort_order == "quota"
+ @users.sort! {|x,y| (x.quota.maximum_running_instances and
y.quota.maximum_running_instances) ? x.quota.maximum_running_instances <=>
y.quota.maximum_running_instances : (x ? 1 : -1) }
+ else
+ @users = User.all(:order => sort_order)
+ end
+ end
+
+ def only_admin
+ unless current_user.permissions.collect { |p| p.role }.find { |r| r.name ==
"Administrator" }
+ flash[:notice] = "Invalid Permission to perform this operation"
+ redirect_to dashboard_url
+ end
+ end
+
+ def cannot_modify_different_user?(user)
+ user && user != current_user &&
!BasePermissionObject.general_permission_scope.can_modify_users(current_user)
+ end
+
end
diff --git a/src/app/services/application_service.rb
b/src/app/services/application_service.rb
index 3315fb1..8161718 100644
--- a/src/app/services/application_service.rb
+++ b/src/app/services/application_service.rb
@@ -41,14 +41,16 @@ module ApplicationService
# @current_user must be defined
def check_privilege(privilege, perm_obj)
- ((perm_obj and perm_obj.has_privilege(@current_user, privilege)) or
- BasePermissionObject.general_permission_scope.has_privilege(@current_user,
+ ((perm_obj and perm_obj.has_privilege(current_user, privilege)) or
+ BasePermissionObject.general_permission_scope.has_privilege(current_user,
privilege))
end
+
def authorized?(privilege, perm_obj=nil)
@perm_obj = perm_obj
check_privilege(privilege,@perm_obj)
end
+
def require_privilege(privilege, perm_obj=nil)
unless authorized?(privilege, perm_obj)
raise PermissionError.new(
diff --git a/src/app/stylesheets/newui.scss b/src/app/stylesheets/newui.scss
index 933165d..e397564 100644
--- a/src/app/stylesheets/newui.scss
+++ b/src/app/stylesheets/newui.scss
@@ -1357,6 +1357,7 @@ $content-left: 180px;
height: $details-height;
bottom: 0;
padding: 0;
+ overflow-y:scroll;
}
/* DEBUG GRID */
diff --git a/src/app/views/admin/users/_form.haml b/src/app/views/admin/users/_form.haml
new file mode 100644
index 0000000..3fdf33f
--- /dev/null
+++ b/src/app/views/admin/users/_form.haml
@@ -0,0 +1,44 @@
+= form.error_messages
+%fieldset.clear
+ = form.label :login, t(:choose_name), :class => "grid_3 alpha"
+ = form.text_field :login, :class => "grid_5"
+%fieldset.clear
+ = form.label :password, form.object.new_record? ? t(:choose_password) :
t(:change_password), :class => "grid_3 alpha"
+ = form.password_field :password, :class => "grid_5"
+%fieldset
+ = form.label :password_confirmation, t(:confirm_password), :class => "grid_3
alpha"
+ = form.password_field :password_confirmation, :class => "grid_5"
+-if has_user_modify?
+ %fieldset.clear
+ = form.label :user_status, "User Status:", :class => "alpha
grid_3"
+ .grid_5
+ = radio_button_tag "user_status","Active",true
+ = label_tag "user_status_active", "Active"
+ = radio_button_tag "user_status","Inactive", false, :disabled
=> true
+ = label_tag "user_status_inactive", "Inactive"
+%fieldset.clear
+ = form.label :first_name, t(:first_name), :class => "alpha grid_3"
+ = form.text_field :first_name, :class => "grid_5"
+%fieldset.clear
+ = form.label :last_name, t(:last_name), :class => "alpha grid_3"
+ = form.text_field :last_name, :class => "grid_5"
+%fieldset.clear
+ = form.label :email, t(:email), :class => "alpha grid_3"
+ = form.text_field :email, :class => "grid_5"
+-if has_user_modify?
+ %h3.grid_16 User Treatment
+ %fieldset.clearfix
+ = label_tag 'apply_treatment', t(:apply_treatment), :class => "alpha
grid_3"
+ = select_tag 'user_treatment', options_for_select([t(:choose_treatment)]),
:class => "grid_5"
+ = submit_tag t(:apply), :disabled => true, :class => "grid_2"
+
+ - form.fields_for :quota do |quota_form|
+ %fieldset.clear
+ = quota_form.label :maximum_running_instances, t(:maximum_running_instances),
:class => "alpha grid_3"
+ = quota_form.text_field :maximum_running_instances, :class =>
"grid_5"
+ (instances)
+ = quota_form.error_message_on :maximum_running_instances, 'Maximum Running
Instances '
+%fieldset.clearfix
+ = form.submit "Save", :class => "submit formbutton"
+ = form.submit "Reset", :class => "submit formbutton"
+ = link_to t(:cancel), cancel_path, :class => 'button formbutton'
diff --git a/src/app/views/admin/users/_list.haml b/src/app/views/admin/users/_list.haml
new file mode 100644
index 0000000..ff62782
--- /dev/null
+++ b/src/app/views/admin/users/_list.haml
@@ -0,0 +1,42 @@
+- form_tag do
+ = link_to "Create", new_admin_user_url, :class => 'button'
+ = restful_submit_tag "Delete", 'destroy',
multi_destroy_admin_users_path, 'DELETE', :id => 'delete_button'
+
+ %table#users_table
+ %thead
+ %tr
+ %th
+ %th= link_to "User ID", admin_users_url(:sort_by =>
"login")
+ %th= link_to "Last Name", admin_users_url(:sort_by =>
"last_name")
+ %th= link_to "First Name", admin_users_url(:sort_by =>
"first_name")
+ %th= link_to "% Quota Used", admin_users_url(:sort_by =>
"percentage_quota_used")
+ %th
+ =link_to "Quota", admin_users_url(:sort_by => "quota")
+ %span (Instances)
+ %th= link_to "e-mail", admin_users_url(:sort_by =>
"email")
+ %th
+ -(a)users.each do |user|
+ %tr
+ %td
+ %input{:name => "user_selected[]", :type =>
"checkbox", :value => user.id, :id => "user_checkbox_#{user.id}"
}
+ %td= link_to user.login, admin_user_path(user)
+ %td= user.last_name
+ %td= user.first_name
+ %td= sprintf("%.2f", user.quota.percentage_used)
+ %td= Quota.no_limit(user.quota.maximum_running_instances) ? "Unlimited"
: user.quota.maximum_running_instances
+ %td= user.email
+ %td= link_to "edit", edit_admin_user_path(user)
+
+:javascript
+ $(document).ready(function () {
+ $('#delete_button').click(function(e) {
+ if ($("#users_table input[@type=radio]:checked").length == 0) {
+ alert('Please select any user to be deleted before clicking Delete
button.');
+ e.preventDefault();
+ } else {
+ if (!confirm("Are you sure you want to delete this user?")) {
+ e.preventDefault();
+ }
+ }
+ });
+ });
diff --git a/src/app/views/admin/users/edit.haml b/src/app/views/admin/users/edit.haml
new file mode 100644
index 0000000..a367fec
--- /dev/null
+++ b/src/app/views/admin/users/edit.haml
@@ -0,0 +1,7 @@
+- if has_user_modify?
+ %h2 Editing User: #{(a)user.first_name} #{(a)user.last_name}
+- else
+ %h2 Editing Account
+
+- form_for @user, :url => admin_user_path(@user), :html => { :method => :put }
do |f|
+ = render :partial => "form", :locals => { :form => f, :cancel_path
=> admin_users_path }
diff --git a/src/app/views/admin/users/index.haml b/src/app/views/admin/users/index.haml
index 606d747..62ccbc6 100644
--- a/src/app/views/admin/users/index.haml
+++ b/src/app/views/admin/users/index.haml
@@ -1 +1,2 @@
-admin/users/index.haml
+- content_for :list do
+ = render :partial => 'list'
diff --git a/src/app/views/admin/users/new.haml b/src/app/views/admin/users/new.haml
new file mode 100644
index 0000000..0958f12
--- /dev/null
+++ b/src/app/views/admin/users/new.haml
@@ -0,0 +1,6 @@
+%h2 New Account
+- form_for @user, :url => admin_users_path do |f|
+ -if current_user
+ = render :partial => "form", :locals => { :form => f, :cancel_path
=> admin_users_path }
+ -else
+ = render :partial => "form", :locals => { :form => f, :cancel_path
=> login_path }
diff --git a/src/app/views/admin/users/show.haml b/src/app/views/admin/users/show.haml
new file mode 100644
index 0000000..c5cca96
--- /dev/null
+++ b/src/app/views/admin/users/show.haml
@@ -0,0 +1,99 @@
+-content_for :list do
+ = render :partial => 'list'
+-content_for :details do
+ .grid_13
+ %h2 #{(a)user.first_name} #{(a)user.last_name} (#{(a)user.login})
+
+ %table
+ %thead
+ %tr
+ %th.show
+ Personal Details
+ %th.show
+ %tbody
+ %tr
+ %td
+ %label Username
+ %td
+ = @user.login
+ %tr
+ %td
+ %label First Name
+ %td
+ = @user.first_name
+ %tr
+ %td
+ %label Last Name
+ %td
+ = @user.last_name
+ %tr
+ %td
+ %label e-mail
+ %td
+ = @user.email
+
+ %table
+ %thead
+ %tr
+ %th.show
+ Quota Status
+ %th.show
+ %tbody
+ %tr
+ %td
+ %label Maximum
+ %td
+ = @quota_resources["running_instances"].max
+ %tr
+ %td
+ %label Used
+ %td
+ = @quota_resources["running_instances"].used
+ %tr
+ %td
+ %label Availabe
+ %td
+ = @quota_resources["running_instances"].available
+
+ %table
+ %thead
+ %tr
+ %th.show
+ Login Information
+ %th.show
+ %tbody
+ %tr
+ %td
+ %label Current Login IP
+ %td
+ = @user.current_login_ip
+ %tr
+ %td
+ %label Current Login at
+ %td
+ = @user.current_login_at
+ %tr
+ %td
+ %label Last Login IP
+ %td
+ = @user.last_login_ip
+ %tr
+ %td
+ %label Last Login at
+ %td
+ = @user.last_login_at
+ %tr
+ %td
+ %label Login Count
+ %td
+ = @user.login_count
+ %tr
+ %td
+ %label Failed Login Count
+ %td
+ = @user.login_count
+ %tr
+ %td
+ %label Last Request at
+ %td
+ = @user.last_request_at
diff --git a/src/config/routes.rb b/src/config/routes.rb
index c1964ec..5dd6560 100644
--- a/src/config/routes.rb
+++ b/src/config/routes.rb
@@ -43,7 +43,8 @@ ActionController::Routing::Routes.draw do |map|
map.connect '/set_layout', :controller => 'application', :action
=> 'set_layout'
map.namespace 'admin' do |r|
- r.resources :hardware_profiles, :pool_families, :providers, :provider_accounts,
:realms, :roles, :settings, :users
+ r.resources :hardware_profiles, :pool_families, :providers, :provider_accounts,
:realms, :roles, :settings
+ r.resources :users, :collection => { :multi_destroy => :delete }
end
map.resources :pools
diff --git a/src/features/step_definitions/user_steps.rb
b/src/features/step_definitions/user_steps.rb
index 19d63c2..c6467e8 100644
--- a/src/features/step_definitions/user_steps.rb
+++ b/src/features/step_definitions/user_steps.rb
@@ -1,5 +1,5 @@
Given /^there is a user "([^"]*)"$/ do |name|
- User.find_by_login(name).should_not == nil
+ User.find_by_login(name).should_not == nil
end
Given /^there are (\d+) users$/ do |number|
diff --git a/src/features/support/paths.rb b/src/features/support/paths.rb
index d55f1f3..c60b940 100644
--- a/src/features/support/paths.rb
+++ b/src/features/support/paths.rb
@@ -18,7 +18,7 @@ module NavigationHelpers
login_path
when /^(.*)'s user page$/i
- user_path(User.find_by_login($1))
+ admin_user_path(User.find_by_login($1))
when /the account page/
account_path
diff --git a/src/features/user.feature b/src/features/user.feature
index a99cb20..2160ed1 100644
--- a/src/features/user.feature
+++ b/src/features/user.feature
@@ -7,9 +7,10 @@ Feature: Manage Users
Given I am an authorised user
And I am logged in
And a user "testuser" exists
+ And I am using new UI
Scenario: Change the password
- Given I am on the users page
+ Given I am on the admin users page
And there is a user "testuser"
When I follow "edit"
Then I should see "Editing User:"
@@ -27,16 +28,16 @@ Feature: Manage Users
Then I should see "User updated!"
Scenario: Show user detials
- Given I am on the users page
+ Given I am on the admin users page
And there is a user "testuser"
When I follow "testuser"
Then I should be on testuser's user page
Scenario: Administrator cancels the creation of a user account
- Given I am on the users page
+ Given I am on the admin users page
And there are 2 users
When I follow "create"
- Then I should be on the new user page
+ Then I should be on the new admin user page
When I follow "cancel"
Then there should only be 2 users
- And I should be on the users page
+ And I should be on the admin users page
--
1.7.3.2
2:21 a.m.
New subject: [PATCH aggregator 4/7] Small refactoring of application controller.
From: Ladislav Martincik <lmartinc(a)redhat.com>
---
src/app/controllers/application_controller.rb | 28 ++++++++++--------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/app/controllers/application_controller.rb
b/src/app/controllers/application_controller.rb
index fd1a92c..b77fe9c 100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
@@ -38,7 +38,7 @@ class ApplicationController < ActionController::Base
def choose_layout
return nil if params[:ajax]
- if(params[:component_layout])
+ if params[:component_layout]
return (ENV["RAILS_ENV"] != "production")?'components/'
<< params[:component_layout]:'aggregator'
end
if cookies[:layout]
@@ -161,9 +161,9 @@ class ApplicationController < ActionController::Base
end
def get_nav_items
- if !current_user.nil?
- @providers = Provider.list_for_user(@current_user, Privilege::PROVIDER_VIEW)
- @pools = Pool.list_for_user(@current_user, Privilege::POOL_VIEW)
+ if current_user.present?
+ @providers = Provider.list_for_user(@current_user, Privilege::PROVIDER_VIEW)
+ @pools = Pool.list_for_user(@current_user, Privilege::POOL_VIEW)
end
end
@@ -216,21 +216,17 @@ class ApplicationController < ActionController::Base
end
def require_user
- unless current_user
- store_location
- flash[:notice] = "You must be logged in to access this page"
- redirect_to login_url
- return false
- end
+ return if current_user
+ store_location
+ flash[:notice] = "You must be logged in to access this page"
+ redirect_to login_url
end
def require_no_user
- if current_user
- store_location
- flash[:notice] = "You must be logged out to access this page"
- redirect_to account_url
- return false
- end
+ return unless current_user
+ store_location
+ flash[:notice] = "You must be logged out to access this page"
+ redirect_to account_url
end
def store_location
--
1.7.3.2
2:21 a.m.
New subject: [PATCH aggregator 5/7] Support new UI in Cucumber.
From: Ladislav Martincik <lmartinc(a)redhat.com>
---
src/features/step_definitions/web_steps.rb | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/features/step_definitions/web_steps.rb
b/src/features/step_definitions/web_steps.rb
index e6d6808..53e5987 100644
--- a/src/features/step_definitions/web_steps.rb
+++ b/src/features/step_definitions/web_steps.rb
@@ -12,6 +12,10 @@ require File.expand_path(File.join(File.dirname(__FILE__),
"..", "support", "pat
# Commonly used webrat steps
# http://github.com/brynary/webrat
+Given /^I am using new UI$/ do
+ cookies['layout'] = 'newui'
+end
+
Given /^(?:|I )am on (.+)$/ do |page_name|
visit path_to(page_name)
end
--
1.7.3.2
2:21 a.m.
New subject: [PATCH aggregator 6/7] Fixing broken tests and business logic for clouds/pools.
From: Ladislav Martincik <lmartinc(a)redhat.com>
---
src/app/models/cloud_account.rb | 4 ++--
src/app/models/pool.rb | 2 --
src/spec/factories/cloud_account.rb | 4 ++--
src/spec/factories/pool.rb | 2 +-
src/spec/models/instance_spec.rb | 1 +
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/app/models/cloud_account.rb b/src/app/models/cloud_account.rb
index a7de905..370f917 100644
--- a/src/app/models/cloud_account.rb
+++ b/src/app/models/cloud_account.rb
@@ -39,7 +39,7 @@ class CloudAccount < ActiveRecord::Base
attr_accessor :x509_cert_priv_file, :x509_cert_pub_file
# Validations
- validates_presence_of :provider_id
+ validates_presence_of :provider
validates_presence_of :label
validates_presence_of :username
validates_uniqueness_of :username, :scope => :provider_id
@@ -173,7 +173,7 @@ EOT
private
def generate_cloud_account_key
client = connect
- if client.feature?(:instances, :authentication_key)
+ if client && client.feature?(:instances, :authentication_key)
key = client.create_key(:name => "#{self.name}_#{Time.now.to_i}_key")
InstanceKey.create(:cloud_account => self, :pem => key.pem, :name =>
key.id) if key
end
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index 32783d8..cb60546 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -28,8 +28,6 @@ class Pool < ActiveRecord::Base
has_many :images, :dependent => :destroy
has_many :hardware_profiles, :dependent => :destroy
-
-
validates_presence_of :name
validates_presence_of :zone
validates_uniqueness_of :name
diff --git a/src/spec/factories/cloud_account.rb b/src/spec/factories/cloud_account.rb
index 797fa47..0b9c0a7 100644
--- a/src/spec/factories/cloud_account.rb
+++ b/src/spec/factories/cloud_account.rb
@@ -1,7 +1,7 @@
Factory.define :cloud_account do |f|
- f.sequence(:username) { |n| "testUser#(n)" }
+ f.sequence(:username) { |n| "testUser#{n}" }
f.password "testPassword"
- f.sequence(:label) { |n| "test label#(n)" }
+ f.sequence(:label) { |n| "test label#{n}" }
f.account_number "3141"
f.x509_cert_priv "x509 private key"
f.x509_cert_pub "x509 public key"
diff --git a/src/spec/factories/pool.rb b/src/spec/factories/pool.rb
index da5525e..b21f844 100644
--- a/src/spec/factories/pool.rb
+++ b/src/spec/factories/pool.rb
@@ -1,5 +1,5 @@
Factory.define :pool do |p|
- p.name 'mypool'
+ p.sequence(:name) { |n| "mypool#{n}" }
p.association :zone, :factory => :zone
end
diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb
index ee9cbaf..625718d 100644
--- a/src/spec/models/instance_spec.rb
+++ b/src/spec/models/instance_spec.rb
@@ -131,6 +131,7 @@ describe Instance do
:username => 'john doe',
:password => 'asdf')
cloud_account.stub!(:connect).and_return(nil)
+ cloud_account.stub!(:valid_credentials?).and_return(true)
instance = Factory.create(:instance, :cloud_account => cloud_account)
instance.get_action_list.should be_empty
end
--
1.7.3.2
2:21 a.m.
New subject: [PATCH aggregator 7/7] New Rack::RestfulSubmit version
From: Ladislav Martincik <lmartinc(a)redhat.com>
---
src/config/environment.rb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/config/environment.rb b/src/config/environment.rb
index 07c0ea0..09ec85b 100644
--- a/src/config/environment.rb
+++ b/src/config/environment.rb
@@ -52,9 +52,9 @@ Rails::Initializer.run do |config|
config.gem "simple-navigation"
config.gem "typhoeus"
config.gem "rb-inotify"
- config.gem 'rack-restful_submit'
+ config.gem 'rack-restful_submit', :version => '1.1.2'
- config.middleware.insert_after Rack::MethodOverride, 'Rack::RestfulSubmit'
+ config.middleware.swap Rack::MethodOverride, 'Rack::RestfulSubmit'
config.active_record.observers = :instance_observer, :task_observer
# Only load the plugins named here, in the order given. By default, all plugins
--
1.7.3.2
3:54 a.m.
On 12/20/2010 09:21 AM, lmartinc(a)redhat.com wrote:
[PATCH aggregator 1/7] Integration of rack-restful_submit
[PATCH aggregator 2/7] Add the Resource Management -> Pools page
[PATCH aggregator 3/7] Moving users into admin/users (first pass).
[PATCH aggregator 4/7] Small refactoring of application controller.
[PATCH aggregator 5/7] Support new UI in Cucumber.
[PATCH aggregator 6/7] Fixing broken tests and business logic for clouds/pools.
[PATCH aggregator 7/7] New Rack::RestfulSubmit version
ACK (2/7 is not going to by pushed because it's part of another
patchset), only nit:
in 3/7 patch you are setting scrolling for edit pane,
"overflow-y:auto;" would be better
Jan
4920
days inactive
4920
days old
deltacloud-devel@lists.fedorahosted.org
8 comments
2 participants
participants (2)
-
Jan Provazník -
lmartinc＠redhat.com