Changeset 718

Show
Ignore:
Timestamp:
11/06/07 15:14:50 (1 year ago)
Author:
markku
Message:

Closes #487. Also fixed tests accidentaly broken by [715]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app/controllers/action_key_controller.rb

    r701 r718  
    1111class ActionKeyController < ApplicationController 
    1212  prepend_before_filter :login_required 
     13  skip_before_filter :check_new_service_requests 
    1314 
    1415  def list 

  • trunk/app/controllers/asset_field_controller.rb

    r701 r718  
    1111class AssetFieldController < ApplicationController 
    1212  append_before_filter :login_required 
     13  skip_before_filter :check_new_service_requests 
    1314 
    1415  def list 
    …… 
    4950    # User field name is optional so set it to nil if it's left empty. 
    5051    params[:model].delete(:user_field_name) if params[:model] and params[:model][:user_field_name] == '' 
    51     # Enumerated field values  
     52    # Enumerated field values 
    5253    params[:model][:enumerated_values] = params[:values] if params[:model] and request.post? 
    5354 
    …… 
    143144 
    144145  def place_options(field_id = nil) 
    145     @asset_type.asset_fields.find(:all, :readonly => true, :order => 'place,name').collect { |f|  
     146    @asset_type.asset_fields.find(:all, :readonly => true, :order => 'place,name').collect { |f| 
    146147      if field_id == f.id 
    147148        [_("-- No change --"), f.place] 

  • trunk/app/controllers/asset_tree_controller.rb

    r703 r718  
    1111class AssetTreeController < ApplicationController 
    1212  prepend_before_filter :login_required 
     13  skip_before_filter :check_new_service_requests, :except => :search 
    1314  LOCK_DURATION = 1.hour 
    1415 

  • trunk/app/controllers/asset_type_controller.rb

    r701 r718  
    1111class AssetTypeController < ApplicationController 
    1212  prepend_before_filter :login_required 
     13  skip_before_filter :check_new_service_requests 
    1314 
    1415  def list 

  • trunk/app/controllers/asset_type_icon_controller.rb

    r717 r718  
    1212  prepend_before_filter :login_required 
    1313  caches_action :view 
    14   skip_before_filter :set_current_user, :set_selected_asset, :prepare_tree_view, :check_new_service_requests 
    15  
     14  skip_before_filter :set_current_user, :set_selected_asset, :prepare_tree_view, :only => :view 
     15  skip_before_filter :check_new_service_requests 
    1616 
    1717  def list 

  • trunk/app/controllers/customer_controller.rb

    r713 r718  
    1111class CustomerController < ApplicationController 
    1212  prepend_before_filter :login_required 
     13  skip_before_filter :check_new_service_requests 
    1314 
    1415  hide_action :initialize 

  • trunk/app/controllers/form_type_controller.rb

    r705 r718  
    1111class FormTypeController < ApplicationController 
    1212  prepend_before_filter :login_required 
     13  skip_before_filter :check_new_service_requests 
    1314 
    1415  # Function: list 

  • trunk/app/controllers/keyring_controller.rb

    r701 r718  
    1111class KeyringController < ApplicationController 
    1212  prepend_before_filter :login_required 
     13  skip_before_filter :check_new_service_requests 
    1314 
    1415  def list 

  • trunk/app/controllers/task_type_controller.rb

    r707 r718  
    1111class TaskTypeController < ApplicationController 
    1212  prepend_before_filter :login_required 
     13  skip_before_filter :check_new_service_requests 
    1314 
    1415  # Fields for create and edit actions 

  • trunk/app/controllers/user_controller.rb

    r717 r718  
    1111class UserController < ApplicationController 
    1212  prepend_before_filter :login_required, :except => [:login, :logout] 
    13   skip_before_filter :set_current_user, :set_selected_asset, :prepare_tree_view, :check_new_service_requests, :only => [:logout, :login] 
     13  skip_before_filter :set_current_user, :set_selected_asset, :prepare_tree_view, :only => [:logout, :login] 
     14  skip_before_filter :check_new_service_requests, :except => [:search, :view, :edit_my_information, :change_password] 
    1415 
    1516  require_key_for :auto_complete_for_user_login, 'user/search' 

  • trunk/app/controllers/user_group_controller.rb

    r701 r718  
    1111class UserGroupController < ApplicationController 
    1212  prepend_before_filter :login_required 
     13  skip_before_filter :check_new_service_requests 
    1314 
    1415  # Function: list 

  • trunk/app/views/layouts/mainlevel.rhtml

    r715 r718  
    267267      <% end -%> 
    268268 
    269       <% if @service_request_count == 1 and not (controller.controller_name == 'task' and controller.action_name == 'view' and params.has_key?(:id) and params[:id].to_i == @service_request_id) -%> 
    270         <p id="service_request_count"> 
    271           <%= link_to(_('There is a new service request'), :controller => 'task', :action => 'view', :id => @service_request_id) %> 
    272         </p> 
    273       <% elsif @service_request_count > 1 and controller.action_name != 'list_new_service_requests' -%> 
    274         <p id="service_request_count"> 
    275           <%= link_to(_('There are %i new service requests', @service_request_count), :controller => 'task', :action => 'list_new_service_requests') %> 
    276         </p> 
    277         <% end -%> 
     269      <% if @service_request_count -%> 
     270        <% if @service_request_count == 1 and not (controller.controller_name == 'task' and controller.action_name == 'view' and params.has_key?(:id) and params[:id].to_i == @service_request_id) -%> 
     271          <p id="service_request_count"> 
     272            <%= link_to(_('There is a new service request'), :controller => 'task', :action => 'view', :id => @service_request_id) %> 
     273          </p> 
     274        <% elsif @service_request_count > 1 and controller.action_name != 'list_new_service_requests' -%> 
     275          <p id="service_request_count"> 
     276            <%= link_to(_('There are %i new service requests', @service_request_count), :controller => 'task', :action => 'list_new_service_requests') %> 
     277          </p> 
     278        <% end -%> 
     279      <% end -%> 
    278280 
    279281        <%= @content_for_layout %> 

  • trunk/test/functional/asset_controller_test.rb

    r707 r718  
    1414    @ref_url = 'http://test.host/redirect/back' 
    1515    @request.env['HTTP_REFERER'] = @ref_url 
     16 
     17    # The service request task type 
     18    service_request_type = TaskType.create!(:name => 'Service request type') 
     19    assert service_request_type.set_as_service_request_type 
    1620 
    1721    @user_group = create_user_group('Admins') 

  • trunk/test/functional/asset_permission_controller_test.rb

    r707 r718  
    1111    @response   = ActionController::TestResponse.new 
    1212 
     13    # The service request task type 
     14    service_request_type = TaskType.create!(:name => 'Service request type') 
     15    assert service_request_type.set_as_service_request_type 
    1316 
    1417    @ref_url = 'http://test.host/redirect/back' 

  • trunk/test/functional/customer_controller_test.rb

    r713 r718  
    1313    simple_setup_for_functional_test 
    1414 
    15     @task_type = TaskType.create!(:name => 'Test') 
    16     assert @task_type.set_as_service_request_type 
     15    @task_type = TaskType.get_service_request_type 
    1716 
    1817    ActionMailer::Base.delivery_method = :test 

  • trunk/test/functional/customer_interface_controller_test.rb

    r713 r718  
    2121 
    2222    @task_type = TaskType.create!(:name => 'Test') 
    23     @service_request_type = TaskType.create!(:name => 'Service request type') 
    24     assert @service_request_type.set_as_service_request_type 
     23    @service_request_type = TaskType.get_service_request_type 
    2524 
    2625    # Create data permission profiles 

  • trunk/test/functional/data_permission_controller_test.rb

    r651 r718  
    1212    @response   = ActionController::TestResponse.new 
    1313 
    14     simple_setup_for_functional_test  
     14    simple_setup_for_functional_test 
    1515  end 
    1616 
    …… 
    8484    @keyring.action_keys << create_action_key('data_permission/edit') 
    8585    login('test') 
    86      
     86 
    8787    authorized_to_edit = create_task(@root, true) 
    8888    authorized_to_edit.other_edit = true 
    …… 
    113113    profile.user_group = @user_group 
    114114    @user_group_root.task_permission_profiles << profile 
    115      
     115 
    116116    authorized_to_edit = create_task(@root, true) 
    117117 
    …… 
    128128 
    129129    assert_equal true, authorized_to_edit.authorized_to_edit? 
    130     post('update_permissions', :id => authorized_to_edit.id,  
     130    post('update_permissions', :id => authorized_to_edit.id, 
    131131         :datatype => authorized_to_edit.class.to_s, 
    132132         :object => {'other_read' => '1', 'other_change_state' => '1', 'other_edit' => '1'}, 
    …… 
    155155    @keyring.action_keys << create_action_key('data_permission/edit') 
    156156    login('test') 
    157      
     157 
    158158    profile = FormPermissionProfile.new(:group_read => true, :group_edit => true) 
    159159    profile.user_group = @user_group 
    160160    @user_group_root.form_permission_profiles << profile 
    161      
     161 
    162162    authorized_to_edit = create_form(@root, true) 
    163      
     163 
    164164    assert_equal false, authorized_to_edit.other_read 
    165165    assert_equal false, authorized_to_edit.other_edit 
    …… 
    204204    profile.user_group = @user_group 
    205205    @user_group_root.attachment_permission_profiles << profile 
    206      
     206 
    207207    authorized_to_edit = create_attachment(@root, true) 
    208      
     208 
    209209    assert_equal false, authorized_to_edit.other_read 
    210210    assert_equal false, authorized_to_edit.other_edit 
    …… 
    252252    profile.user_group = @user_group 
    253253    @user_group_root.task_permission_profiles << profile 
    254      
     254 
    255255    profile = TaskPermissionProfile.new(:group_read => true, :group_change_state => false, :group_edit => false) 
    256256    profile.user_group = UserGroup.create!(:name => 'Foobar', :info => '') 
    257257    @user_group_root.task_permission_profiles << profile 
    258      
     258 
    259259    authorized_to_edit = create_task(@root, true) 
    260      
     260 
    261261    login('test') 
    262262 
    …… 
    273273    assert_equal false, permissions1.group_change_state 
    274274    assert_equal true, permissions1.group_edit 
    275      
     275 
    276276    assert_equal true, permissions2.group_read 
    277277    assert_equal false, permissions2.group_change_state 
    …… 
    280280    assert_equal true, authorized_to_edit.authorized_to_edit? 
    281281 
    282     post('update_permissions', :id => authorized_to_edit.id,  
     282    post('update_permissions', :id => authorized_to_edit.id, 
    283283         :datatype => authorized_to_edit.class.to_s, 
    284284         :object => {'other_read' => '1', 'other_change_state' => '0', 'other_edit' => '0'}, 
    …… 
    312312    profile.user_group = @user_group 
    313313    @user_group_root.task_permission_profiles << profile 
    314      
     314 
    315315    profile = TaskPermissionProfile.new(:group_read => true, :group_change_state => false, :group_edit => false) 
    316316    profile.user_group = UserGroup.create!(:name => 'Foobar', :info => '') 
    317317    @user_group_root.task_permission_profiles << profile 
    318      
     318 
    319319    authorized_to_edit = create_task(@root, true) 
    320      
     320 
    321321    login('test') 
    322322 
    …… 
    331331    assert_equal true, admins.group_edit 
    332332    assert_equal true, authorized_to_edit.authorized_to_edit? 
    333     post('update_permissions', :id => authorized_to_edit.id,  
     333    post('update_permissions', :id => authorized_to_edit.id, 
    334334         :datatype => authorized_to_edit.class.to_s, 
    335335         :object => {'other_read' => '0', 'other_change_state' => '0', 'other_edit' => '0'}, 
    …… 
    361361    profile.user_group = @user_group 
    362362    @user_group_root.task_permission_profiles << profile 
    363      
     363 
    364364    authorized_to_edit = create_task(@root, true) 
    365365 
    …… 
    390390    profile.user_group = @user_group 
    391391    @user_group_root.form_permission_profiles << profile 
    392      
     392 
    393393    authorized_to_edit = create_form(@root, true) 
    394394 
    …… 
    397397    assert_equal false, authorized_to_edit.data_permissions.map {|p| p.user_group}.include?(user_group) 
    398398 
    399     post('create_permission',  
     399    post('create_permission', 
    400400         :id => authorized_to_edit.id, 
    401401         :datatype => authorized_to_edit.class.to_s, 
    …… 
    419419    profile.user_group = @user_group 
    420420    @user_group_root.attachment_permission_profiles << profile 
    421      
     421 
    422422    authorized_to_edit = create_attachment(@root, true) 
    423423 
    …… 
    426426    assert_equal false, authorized_to_edit.data_permissions.map {|p| p.user_group}.include?(user_group) 
    427427 
    428     post('create_permission',  
     428    post('create_permission', 
    429429         :id => authorized_to_edit.id, 
    430430         :datatype => authorized_to_edit.class.to_s, 
    …… 
    440440    assert_equal true, authorized_to_edit.data_permissions(true).map {|p| p.user_group}.include?(user_group) 
    441441  end 
    442    
     442 
    443443  def test_preview 
    444444    @keyring.action_keys << create_action_key('data_permission/preview') 

  • trunk/test/functional/form_controller_test.rb

    r619 r718  
    239239    @keyring.action_keys << create_action_key('form/view') 
    240240    login('test') 
    241      
     241 
    242242    setup_simple_form_type 
    243243    setup_test_forms 

  • trunk/test/functional/search_controller_test.rb

    r707 r718  
    1414    @ref_url = 'http://test.host/redirect/back' 
    1515    @request.env['HTTP_REFERER'] = @ref_url 
     16 
     17    # The service request task type 
     18    service_request_type = TaskType.create!(:name => 'Service request type') 
     19    assert service_request_type.set_as_service_request_type 
    1620 
    1721    # Create the root asset, a test user and a user group that has all permissions to the root asset. 

  • trunk/test/functional/task_controller_test.rb

    r715 r718  
    3737    @keyring.users << @user2 
    3838 
    39     @service_request_type = TaskType.create!(:name => 'Service request type') 
    40     assert @service_request_type.set_as_service_request_type 
     39    @service_request_type = TaskType.get_service_request_type 
    4140 
    4241    ActionMailer::Base.delivery_method = :test 

  • trunk/test/functional/task_type_controller_test.rb

    r652 r718  
    2222 
    2323  def test_list_GET_empty 
     24    TaskType.delete_all 
     25 
    2426    @keyring.action_keys << create_action_key('task_type/list') 
    2527    login('test') 

  • trunk/test/test_helper.rb

    r710 r718  
    4848    @ref_url = 'http://test.host/redirect/back' 
    4949    @request.env['HTTP_REFERER'] = @ref_url 
     50 
     51    # The service request task type 
     52    service_request_type = TaskType.create!(:name => 'Service request type') 
     53    assert service_request_type.set_as_service_request_type 
    5054 
    5155    @user_group = create_user_group('test') 

© 2004-2007 Norfello Oy All Rights Reserved