diff --git a/.gitignore b/.gitignore index 080b946b0ae0..0e99e2666e32 100644 --- a/.gitignore +++ b/.gitignore @@ -4,83 +4,83 @@ # or operating system, you probably want to add a global ignore instead: # git config --global core.excludesfile ~/.gitignore_global -# Ignore .swp files -.*.swp +# Configuration ================================================================ +# These files will differ from one user to another; +# committing them may cause Zammad to behave unexpectedly on other machines -# Ignore bundler config -/.bundle - -# Ignore mac stuff -.DS_Store - -# Ignore Rubymine config -/.idea - -# Ignore .project files -/.project - -# Ignore .rbenv-vars -/.rbenv-vars - -# exclude the figaro ENV setting helper file - run 'bundle exec figaro install' for creating your own -# see: https://github.com/laserlemon/figaro -# Ignore application configuration -/config/application.yml - -# Ignore .envrc for direnv -/.envrc +# Zammad ----------------------------------------------------------------------- -# Ignore database config +# database (copy from config/database/database.yml, or use `rails bs:init`) /config/database.yml -# Ignore translation cache files -/config/locales*.yml -/config/translations/*.yml +# Third-Party ------------------------------------------------------------------ +# The config files / dev tools listed below are optional +# and may not be present on most users' machines -# Ignore generated documentation -/doc +# Bundler +/.bundle +/Gemfile.local -# Ignore coverage stuff -/coverage +# Clutter ====================================================================== +# These files are automatically generated; +# in most cases, committing them won't do anything other than bloat the repo -# Ignore the default SQLite database. -/db/*.sqlite3 +# Zammad ----------------------------------------------------------------------- -# Ignore local changes to schema.rb (e. g. through extentions) +# database files +/db/*.sqlite3 /db/schema.rb -# Ignore custom gem file -/Gemfile.local +# translation cache files +/config/locales*.yml +/config/translations/*.yml -# Ignore node modules +# NPM / Yarn /node_modules -# Ignore all logfiles and tempfiles. +# logfiles and tempfiles /log /public/assets/*.* /public/assets/app /public/assets/custom /public/assets/chat/node_modules /tmp/* -/tmp/pids/* -/storage/fs - -# except /tmp/pids/ which is needed for certain Zammad processes -!/tmp !/tmp/pids +/tmp/pids/* !/tmp/pids/.keep +/storage/fs -# ignore doorkeeper auto generated folder +# doorkeeper (OAuth 2) /public/assets/doorkeeper -# ignore all automatically downloaded images except the default ones +# images /public/assets/images/* -!/public/assets/images/icons +!/public/assets/images/icons/ !/public/assets/images/avatar-bg.png !/public/assets/images/chat-demo-avatar.png !/public/assets/images/eyedropper.gif !/public/assets/images/icons.svg !/public/assets/images/logo.svg -# ignore byebug history -/.byebug_history \ No newline at end of file +# Third-Party ------------------------------------------------------------------ + +# macOS +.DS_Store + +# vim +.*.sw[pon] + +# RubyMine +/.idea + +# Eclipse +/.project + +# Byebug +/.byebug_history + +# SimpleCov +/coverage + +# RDoc / YARD +/doc diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1bdd0f0d77a6..c38300881fc7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,7 +78,6 @@ test:unit:mysql: - rake db:migrate - rake db:seed - rake test:units - - rake test:controllers - ruby -I test/ test/integration/object_manager_test.rb - ruby -I test/ test/integration/object_manager_attributes_controller_test.rb - ruby -I test/ test/integration/package_test.rb @@ -96,7 +95,6 @@ test:unit:postgresql: - rake db:migrate - rake db:seed - rake test:units - - rake test:controllers - ruby -I test/ test/integration/object_manager_test.rb - ruby -I test/ test/integration/object_manager_attributes_controller_test.rb - ruby -I test/ test/integration/package_test.rb @@ -240,12 +238,10 @@ test:integration:es_mysql: - export ES_URL="http://localhost:9200" - rake db:create - rake db:migrate + - ruby -I test/ test/integration/elasticsearch_active_test.rb - ruby -I test/ test/integration/elasticsearch_test.rb - - ruby -I test/ test/controllers/search_controller_test.rb - ruby -I test/ test/integration/report_test.rb - - ruby -I test/ test/controllers/form_controller_test.rb - - ruby -I test/ test/controllers/user_controller_test.rb - - ruby -I test/ test/controllers/organization_controller_test.rb + - bundle exec rspec --tag searchindex - rake db:drop test:integration:es_postgresql: @@ -259,12 +255,10 @@ test:integration:es_postgresql: - export ES_URL="http://localhost:9200" - rake db:create - rake db:migrate + - ruby -I test/ test/integration/elasticsearch_active_test.rb - ruby -I test/ test/integration/elasticsearch_test.rb - - ruby -I test/ test/controllers/search_controller_test.rb - ruby -I test/ test/integration/report_test.rb - - ruby -I test/ test/controllers/form_controller_test.rb - - ruby -I test/ test/controllers/user_controller_test.rb - - ruby -I test/ test/controllers/organization_controller_test.rb + - bundle exec rspec --tag searchindex - rake db:drop test:integration:zendesk_mysql: @@ -300,7 +294,7 @@ test:integration:otrs_6_mysql: - mysql script: - export RAILS_ENV=test - - export IMPORT_OTRS_ENDPOINT="http://vz1185.test.znuny.com/otrs/public.pl?Action=ZammadMigrator" + - export IMPORT_OTRS_ENDPOINT="https://vz1185.test.znuny.com/otrs/public.pl?Action=ZammadMigrator" - rake db:create - rake db:migrate - ruby -I test/ test/integration/otrs_import_test.rb @@ -313,7 +307,7 @@ test:integration:otrs_6_postgresql: - postgresql script: - export RAILS_ENV=test - - export IMPORT_OTRS_ENDPOINT="http://vz1185.test.znuny.com/otrs/public.pl?Action=ZammadMigrator" + - export IMPORT_OTRS_ENDPOINT="https://vz1185.test.znuny.com/otrs/public.pl?Action=ZammadMigrator" - rake db:create - rake db:migrate - ruby -I test/ test/integration/otrs_import_test.rb @@ -405,13 +399,13 @@ test:browser:integration:api_client_ruby: script: - RAILS_ENV=test rake db:create - cp contrib/auto_wizard_test.json auto_wizard.json - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - git clone git@github.com:zammad/zammad-api-client-ruby.git || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0 + - git clone git@github.com:zammad/zammad-api-client-ruby.git || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0 - cd zammad-api-client-ruby - bundle install --jobs 8 - export TEST_URL=http://$IP:$BROWSER_PORT/ - - bundle exec rspec || (cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1) - - cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - bundle exec rspec || (cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0) + - cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0 test:browser:integration:api_client_php: stage: browser-core @@ -422,16 +416,16 @@ test:browser:integration:api_client_php: script: - RAILS_ENV=test rake db:create - cp contrib/auto_wizard_test.json auto_wizard.json - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - git clone git@github.com:zammad/zammad-api-client-php || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0 + - git clone git@github.com:zammad/zammad-api-client-php || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0 - wget http://$IP:$BROWSER_PORT/api/v1/getting_started/auto_wizard - cd zammad-api-client-php - composer install - export ZAMMAD_PHP_API_CLIENT_UNIT_TESTS_URL=http://$IP:$BROWSER_PORT - export ZAMMAD_PHP_API_CLIENT_UNIT_TESTS_USERNAME=master@example.com - export ZAMMAD_PHP_API_CLIENT_UNIT_TESTS_PASSWORD=test - - vendor/bin/phpunit || (cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1) - - cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - vendor/bin/phpunit || (cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0) + - cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0 test:browser:twitter_ff: stage: browser-integration @@ -443,12 +437,12 @@ test:browser:twitter_ff: script: - export BROWSER=firefox - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - RAILS_ENV=test rake db:create - cp contrib/auto_wizard_test.json auto_wizard.json - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - ruby -I test/ test/integration/twitter_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0 + - ruby -I test/ test/integration/twitter_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0 test:browser:facebook_ff: stage: browser-integration @@ -460,12 +454,12 @@ test:browser:facebook_ff: script: - export BROWSER=firefox - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - RAILS_ENV=test rake db:create - cp contrib/auto_wizard_test.json auto_wizard.json - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - ruby -I test/ test/integration/facebook_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0 + - ruby -I test/ test/integration/facebook_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0 test:browser:autowizard_ff: stage: browser-core @@ -476,12 +470,12 @@ test:browser:autowizard_ff: script: - export BROWSER=firefox - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - RAILS_ENV=test rake db:create - cp contrib/auto_wizard_example.json auto_wizard.json - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - ruby -I test/ test/integration/auto_wizard_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - ruby -I test/ test/integration/auto_wizard_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:ff_1_mysql: stage: browser-core @@ -493,16 +487,16 @@ test:browser:core:ff_1_mysql: script: - export BROWSER=firefox - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 1 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:ff_2_mysql: stage: browser-core @@ -514,16 +508,16 @@ test:browser:core:ff_2_mysql: script: - export BROWSER=firefox - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 2 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:ff_3_mysql: stage: browser-core @@ -535,12 +529,12 @@ test:browser:core:ff_3_mysql: script: - export BROWSER=firefox - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - script/build/test_slice_tests.sh 3 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:ff_4_mysql: stage: browser-core @@ -552,16 +546,16 @@ test:browser:core:ff_4_mysql: script: - export BROWSER=firefox - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 4 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:ff_5_mysql: stage: browser-core @@ -573,16 +567,16 @@ test:browser:core:ff_5_mysql: script: - export BROWSER=firefox - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 5 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:ff_6_mysql: stage: browser-core @@ -594,16 +588,16 @@ test:browser:core:ff_6_mysql: script: - export BROWSER=firefox - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 6 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:ff_1_postgresql: stage: browser-core @@ -615,16 +609,16 @@ test:browser:core:ff_1_postgresql: script: - export BROWSER=firefox - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 1 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:ff_2_postgresql: stage: browser-core @@ -636,16 +630,16 @@ test:browser:core:ff_2_postgresql: script: - export BROWSER=firefox - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 2 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:ff_3_postgresql: stage: browser-core @@ -657,12 +651,12 @@ test:browser:core:ff_3_postgresql: script: - export BROWSER=firefox - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - script/build/test_slice_tests.sh 3 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:ff_4_postgresql: stage: browser-core @@ -674,16 +668,16 @@ test:browser:core:ff_4_postgresql: script: - export BROWSER=firefox - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 4 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:ff_5_postgresql: stage: browser-core @@ -695,16 +689,16 @@ test:browser:core:ff_5_postgresql: script: - export BROWSER=firefox - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 5 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:ff_6_postgresql: stage: browser-core @@ -716,16 +710,16 @@ test:browser:core:ff_6_postgresql: script: - export BROWSER=firefox - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 6 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:chrome_1_mysql: stage: browser-core @@ -737,16 +731,16 @@ test:browser:core:chrome_1_mysql: script: - export BROWSER=chrome - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 1 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:chrome_2_mysql: stage: browser-core @@ -758,16 +752,16 @@ test:browser:core:chrome_2_mysql: script: - export BROWSER=chrome - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 2 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:chrome_3_mysql: stage: browser-core @@ -779,16 +773,16 @@ test:browser:core:chrome_3_mysql: script: - export BROWSER=chrome - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 3 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:chrome_4_mysql: stage: browser-core @@ -800,16 +794,16 @@ test:browser:core:chrome_4_mysql: script: - export BROWSER=chrome - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 4 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:chrome_5_mysql: stage: browser-core @@ -821,16 +815,16 @@ test:browser:core:chrome_5_mysql: script: - export BROWSER=chrome - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 5 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:chrome_6_mysql: stage: browser-core @@ -842,16 +836,16 @@ test:browser:core:chrome_6_mysql: script: - export BROWSER=chrome - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 6 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:chrome_1_postgresql: stage: browser-core @@ -863,16 +857,16 @@ test:browser:core:chrome_1_postgresql: script: - export BROWSER=chrome - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 1 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:chrome_2_postgresql: stage: browser-core @@ -884,16 +878,16 @@ test:browser:core:chrome_2_postgresql: script: - export BROWSER=chrome - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 2 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:chrome_3_postgresql: stage: browser-core @@ -905,16 +899,16 @@ test:browser:core:chrome_3_postgresql: script: - export BROWSER=chrome - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 3 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:chrome_4_postgresql: stage: browser-core @@ -926,16 +920,16 @@ test:browser:core:chrome_4_postgresql: script: - export BROWSER=chrome - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 4 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:chrome_5_postgresql: stage: browser-core @@ -947,16 +941,16 @@ test:browser:core:chrome_5_postgresql: script: - export BROWSER=chrome - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 5 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:core:chrome_6_postgresql: stage: browser-core @@ -968,16 +962,16 @@ test:browser:core:chrome_6_postgresql: script: - export BROWSER=chrome - export BROWSER_URL=http://$IP:$BROWSER_PORT - - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" + - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0" - unset MAILBOX_AUTO1 - unset MAILBOX_AUTO2 - unset MAILBOX_MANUAL1 - unset MAILBOX_MANUAL2 - script/build/test_slice_tests.sh 6 - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:autowizard_chrome: stage: browser-core @@ -990,9 +984,9 @@ test:browser:autowizard_chrome: - export BROWSER_URL=http://$IP:$BROWSER_PORT - RAILS_ENV=test rake db:create - cp contrib/auto_wizard_example.json auto_wizard.json - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - ruby -I test/ test/integration/auto_wizard_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 + - ruby -I test/ test/integration/auto_wizard_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1 test:browser:integration:twitter_chrome: stage: browser-integration @@ -1006,9 +1000,9 @@ test:browser:integration:twitter_chrome: - export BROWSER_URL=http://$IP:$BROWSER_PORT - RAILS_ENV=test rake db:create - cp contrib/auto_wizard_test.json auto_wizard.json - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - ruby -I test/ test/integration/twitter_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0 + - ruby -I test/ test/integration/twitter_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0 test:browser:integration:facebook_chrome: stage: browser-integration @@ -1022,9 +1016,9 @@ test:browser:integration:facebook_chrome: - export BROWSER_URL=http://$IP:$BROWSER_PORT - RAILS_ENV=test rake db:create - cp contrib/auto_wizard_test.json auto_wizard.json - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - ruby -I test/ test/integration/facebook_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0 + - ruby -I test/ test/integration/facebook_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0 test:browser:integration:otrs_chrome: stage: browser-integration @@ -1036,9 +1030,9 @@ test:browser:integration:otrs_chrome: - export BROWSER=chrome - export BROWSER_URL=http://$IP:$BROWSER_PORT - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - ruby -I test/ test/integration/otrs_import_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0 + - ruby -I test/ test/integration/otrs_import_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0 test:browser:integration:zendesk_chrome: stage: browser-integration @@ -1050,6 +1044,21 @@ test:browser:integration:zendesk_chrome: - export BROWSER=chrome - export BROWSER_URL=http://$IP:$BROWSER_PORT - RAILS_ENV=test rake db:create - - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - - ruby -I test/ test/integration/zendesk_import_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 - - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0 + - ruby -I test/ test/integration/zendesk_import_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0 + +test:browser:integration:idoit_chrome: + stage: browser-integration + dependencies: + - browser:build + tags: + - browser + script: + - export BROWSER=chrome + - export BROWSER_URL=http://$IP:$BROWSER_PORT + - RAILS_ENV=test rake db:create + - cp contrib/auto_wizard_test.json auto_wizard.json + - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0 + - ruby -I test/ test/integration/idoit_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0 + - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0 diff --git a/.travis.yml b/.travis.yml index 59b08827a93c..fc3afe9bbd9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,7 +65,6 @@ script: - bundle exec rspec - rake db:reset - rake test:units - - rake test:controllers - ruby -I test/ test/integration/object_manager_test.rb - ruby -I test/ test/integration/package_test.rb after_success: diff --git a/CHANGELOG.md b/CHANGELOG.md index 0afee119e7c4..6f90af7148e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Change Log -## [2.6.0](https://github.com/zammad/zammad/tree/2.6.0) (2018-xx-xx) -[Full Changelog](https://github.com/zammad/zammad/compare/2.5.0...2.6.0) +## [2.7.0](https://github.com/zammad/zammad/tree/2.7.0) (2018-xx-xx) +[Full Changelog](https://github.com/zammad/zammad/compare/2.6.0...2.7.0) **Implemented enhancements:** @@ -12,5 +12,4 @@ - \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file diff --git a/Gemfile b/Gemfile index b7a61f748628..29b129d0d9fa 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,7 @@ ruby '2.4.4' gem 'rails', '5.1.5' # core - rails additions +gem 'activerecord-import' gem 'activerecord-session_store' gem 'composite_primary_keys' gem 'json' @@ -80,7 +81,7 @@ gem 'twitter' # channels - email additions gem 'htmlentities' -gem 'mail', '>= 2.7.1.rc1' +gem 'mail', '2.6.6' gem 'mime-types' gem 'rchardet', '>= 1.8.0' gem 'valid_email2' @@ -158,14 +159,15 @@ group :development, :test do # changelog generation gem 'github_changelog_generator' - # Setting ENV for testing purposes - gem 'figaro' - # Use Factory Bot for generating random test data gem 'factory_bot_rails' # mock http calls gem 'webmock' + + # record and replay TCP/HTTP transactions + gem 'tcr' + gem 'vcr' end # Want to extend Zammad with additional gems? @@ -174,4 +176,5 @@ end # without having your changes overwritten during upgrades.) # ZAMMAD DEVS: Consult the internal wiki # (or else risk pushing unwanted changes to Gemfile.lock!) +# https://git.znuny.com/zammad/zammad/wikis/Tips#user-content-customizing-the-gemfile eval_gemfile 'Gemfile.local' if File.exist?('Gemfile.local') diff --git a/Gemfile.lock b/Gemfile.lock index 77042459404e..592e36c5f7c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,6 +49,8 @@ GEM activemodel (= 5.1.5) activesupport (= 5.1.5) arel (~> 8.0) + activerecord-import (0.25.0) + activerecord (>= 3.2) activerecord-nulldb-adapter (0.3.7) activerecord (>= 2.0.0) activerecord-session_store (1.1.0) @@ -108,7 +110,7 @@ GEM thor crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.3) + crass (1.0.4) daemons (1.2.5) dalli (2.7.6) debug_inspector (0.0.3) @@ -122,7 +124,7 @@ GEM docile (1.1.5) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.2.6) + doorkeeper (4.4.0) railties (>= 4.2) eco (1.0.0) coffee-script @@ -145,12 +147,10 @@ GEM multipart-post (>= 1.2, < 3) faraday-http-cache (2.0.0) faraday (~> 0.8) - ffi (1.9.23) + ffi (1.9.25) ffi-compiler (0.1.3) ffi (>= 1.0.0) rake - figaro (1.1.1) - thor (~> 0.14) formatador (0.2.5) github_changelog_generator (1.14.3) activesupport @@ -222,15 +222,14 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.12) - mail (2.7.1.rc1) - mini_mime (>= 0.1.1) + mail (2.6.6) + mime-types (>= 1.16, < 4) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.9.0) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.11.3) multi_json (1.12.2) @@ -243,7 +242,7 @@ GEM net-ldap (0.16.1) netrc (0.11.0) nio4r (2.3.0) - nokogiri (1.8.2) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) nori (2.6.0) notiffany (0.1.1) @@ -320,7 +319,7 @@ GEM rack (2.0.5) rack-livereload (0.3.16) rack - rack-test (1.0.0) + rack-test (1.1.0) rack (>= 1.0, < 3) rails (5.1.5) actioncable (= 5.1.5) @@ -360,23 +359,23 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retriable (2.1.0) - rspec-core (3.7.0) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-rails (3.7.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-support (~> 3.7.0) - rspec-support (3.7.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) rubocop (0.54.0) parallel (~> 1.10) parser (>= 2.5) @@ -386,7 +385,7 @@ GEM unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.9.0) ruby_dep (1.5.0) - rubyzip (1.2.1) + rubyzip (1.2.2) safe_yaml (1.0.4) sass (3.5.3) sass-listen (~> 4.0.0) @@ -402,7 +401,7 @@ GEM sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) - selenium-webdriver (3.11.0) + selenium-webdriver (3.13.1) childprocess (~> 0.5) rubyzip (~> 1.2) shellany (0.0.1) @@ -424,6 +423,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) + tcr (0.2.0) telegramAPI (1.4.2) rest-client (~> 2.0, >= 2.0.2) telephone_number (1.3.0) @@ -463,6 +463,7 @@ GEM valid_email2 (2.1.0) activemodel (>= 3.2) mail (~> 2.5) + vcr (4.0.0) viewpoint (1.1.0) httpclient logging @@ -487,6 +488,7 @@ PLATFORMS ruby DEPENDENCIES + activerecord-import activerecord-nulldb-adapter activerecord-session_store argon2 @@ -511,7 +513,6 @@ DEPENDENCIES eventmachine execjs factory_bot_rails - figaro github_changelog_generator guard guard-livereload @@ -522,7 +523,7 @@ DEPENDENCIES json koala libv8 - mail (>= 2.7.1.rc1) + mail (= 2.6.6) mime-types mysql2 net-ldap @@ -559,6 +560,7 @@ DEPENDENCIES slack-notifier sprockets sqlite3 + tcr telegramAPI telephone_number test-unit @@ -567,6 +569,7 @@ DEPENDENCIES uglifier unicorn valid_email2 + vcr viewpoint webmock writeexcel diff --git a/VERSION b/VERSION index 3c8067655b26..e17ae7579770 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6.x +2.7.x diff --git a/app/assets/javascripts/app/controllers/_application_controller.coffee b/app/assets/javascripts/app/controllers/_application_controller.coffee index 56f4a520a922..f51d9094b550 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.coffee @@ -77,10 +77,6 @@ class App.Controller extends Spine.Controller if @ajaxCalls for callId in @ajaxCalls App.Ajax.abort(callId) - @userTicketPopupsDestroy() - @ticketPopupsDestroy() - @userPopupsDestroy() - @organizationPopupsDestroy() release: -> # release custom bindings after it got removed from dom @@ -182,11 +178,11 @@ class App.Controller extends Spine.Controller formParam: (form) -> App.ControllerForm.params(form) - formDisable: (form) -> - App.ControllerForm.disable(form) + formDisable: (form, type) -> + App.ControllerForm.disable(form, type) - formEnable: (form) -> - App.ControllerForm.enable(form) + formEnable: (form, type) -> + App.ControllerForm.enable(form, type) formValidate: (data) -> App.ControllerForm.validate(data) @@ -295,228 +291,6 @@ class App.Controller extends Spine.Controller item.attr('title', App.i18n.translateTimestamp(timestamp)) item.html(time) - ticketPopups: (position = 'right') -> - - # open ticket in new task if curent user agent - if @permissionCheck('ticket.agent') - @$('div.ticket-popover, span.ticket-popover').bind('click', (e) => - id = $(e.target).data('id') - return if !id - ticket = App.Ticket.findNative(id) - @navigate ticket.uiUrl() - ) - - @ticketPopupsDestroy() - - # show ticket popup - ui = @ - @ticketPopupsList = @el.find('.ticket-popover').popover( - trigger: 'hover' - container: 'body' - html: true - animation: false - delay: 100 - placement: position - title: -> - ticketId = $(@).data('id') - ticket = App.Ticket.find(ticketId) - App.Utils.htmlEscape(ticket.title) - content: -> - ticketId = $(@).data('id') - ticket = App.Ticket.fullLocal(ticketId) - html = $(App.view('popover/ticket')( - ticket: ticket - )) - html.find('.humanTimeFromNow').each(-> - ui.frontendTimeUpdateItem($(@)) - ) - html - ) - - ticketPopupsDestroy: => - if @ticketPopupsList - @ticketPopupsList.popover('destroy') - - userPopups: (position = 'right') -> - - # open user in new task if current user is agent - return if !@permissionCheck('ticket.agent') - @$('div.user-popover, span.user-popover').bind('click', (e) => - id = $(e.target).data('id') - return if !id - user = App.User.findNative(id) - @navigate user.uiUrl() - ) - - @userPopupsDestroy() - - # show user popup - @userPopupsList = @el.find('.user-popover').popover( - trigger: 'hover' - container: 'body' - html: true - animation: false - delay: 100 - placement: "auto #{position}" - title: -> - userId = $(@).data('id') - user = App.User.find(userId) - headline = App.Utils.htmlEscape(user.displayName()) - if user.isOutOfOffice() - headline += " (#{App.Utils.htmlEscape(user.outOfOfficeText())})" - headline - content: -> - userId = $(@).data('id') - user = App.User.fullLocal(userId) - - # get display data - userData = [] - for attributeName, attributeConfig of App.User.attributesGet('view') - - # check if value for _id exists - name = attributeName - nameNew = name.substr(0, name.length - 3) - if nameNew of user - name = nameNew - - # add to show if value exists - if user[name] && attributeConfig.shown - - # do not show firstname and lastname / already show via diplayName() - if name isnt 'firstname' && name isnt 'lastname' && name isnt 'organization' - userData.push attributeConfig - - # insert data - App.view('popover/user')( - user: user - userData: userData - ) - ) - - userPopupsDestroy: => - if @userPopupsList - @userPopupsList.popover('destroy') - - organizationPopups: (position = 'right') -> - - # open org in new task if current user agent - return if !@permissionCheck('ticket.agent') - - @$('div.organization-popover, span.organization-popover').bind('click', (e) => - id = $(e.target).data('id') - return if !id - organization = App.Organization.find(id) - @navigate organization.uiUrl() - ) - - @organizationPopupsDestroy() - - # show organization popup - @organizationPopupsList = @el.find('.organization-popover').popover( - trigger: 'hover' - container: 'body' - html: true - animation: false - delay: 100 - placement: "auto #{position}" - title: -> - organization_id = $(@).data('id') - organization = App.Organization.find(organization_id) - App.Utils.htmlEscape(organization.name) - content: -> - organization_id = $(@).data('id') - organization = App.Organization.fullLocal(organization_id) - - # get display data - organizationData = [] - for attributeName, attributeConfig of App.Organization.attributesGet('view') - - # check if value for _id exists - name = attributeName - nameNew = name.substr(0, name.length - 3) - if nameNew of organization - name = nameNew - - # add to show if value exists - if organization[name] && attributeConfig.shown - - # do not show firstname and lastname / already show via diplayName() - if name isnt 'name' - organizationData.push attributeConfig - - # insert data - App.view('popover/organization')( - organization: organization, - organizationData: organizationData, - ) - ) - - organizationPopupsDestroy: => - if @organizationPopupsList - @organizationPopupsList.popover('destroy') - - userTicketPopups: (params) -> - - show = (data, ticket_list) => - - if !data.position - data.position = 'left' - - @userTicketPopupsDestroy() - - # show user popup - ui = @ - @userTicketPopupsList = @el.find(data.selector).popover( - trigger: 'hover' - container: 'body' - html: true - animation: false - delay: 100 - placement: "auto #{data.position}" - title: -> - $(@).find('[title="*"]').val() - - content: -> - type = $(@).filter('[data-type]').data('type') - tickets = [] - if ticket_list[type] - for ticketId in ticket_list[type] - tickets.push App.Ticket.fullLocal(ticketId) - - # insert data - html = $(App.view('popover/user_ticket_list')( - tickets: tickets - )) - html.find('.humanTimeFromNow').each( -> - ui.frontendTimeUpdateItem($(@)) - ) - html - ) - - fetch = (params) => - @ajax( - type: 'GET' - url: "#{@Config.get('api_path')}/ticket_customer" - data: - customer_id: params.user_id - processData: true - success: (data, status, xhr) -> - App.Collection.loadAssets(data.assets) - show(params, { open: data.ticket_ids_open, closed: data.ticket_ids_closed }) - ) - - # get data - fetch(params) - - userTicketPopupsDestroy: => - if @userTicketPopupsList - @userTicketPopupsList.popover('destroy') - - anyPopoversDestroy: -> - - # do not remove permanent .popover--notifications widget - $('.popover:not(.popover--notifications)').remove() - recentView: (object, o_id) => params = object: object @@ -556,6 +330,10 @@ class App.Controller extends Spine.Controller stopPropagation: (e) -> e.stopPropagation() + preventDefaultAndstopPropagation: (e) -> + e.preventDefault() + e.stopPropagation() + startLoading: (el) => return if @initLoadingDone && !el @initLoadingDone = true diff --git a/app/assets/javascripts/app/controllers/_application_controller_form.coffee b/app/assets/javascripts/app/controllers/_application_controller_form.coffee index ed8b58084f9a..b7e43d5752cb 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_form.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_form.coffee @@ -3,7 +3,6 @@ class App.ControllerForm extends App.Controller super for key, value of params @[key] = value - if !@handlers @handlers = [] @@ -14,7 +13,6 @@ class App.ControllerForm extends App.Controller @handlers.push @showHideToggle @handlers.push @requiredMandantoryToggle - if !@model @model = {} if !@attributes @@ -64,9 +62,7 @@ class App.ControllerForm extends App.Controller fieldset = @el else fieldset = $('
') - return fieldset if _.isEmpty(@model) - # collect form attributes @attributes = [] if @model.attributesGet @@ -330,7 +326,7 @@ class App.ControllerForm extends App.Controller bookmarkable: @bookmarkable ) ) - fullItem.find('.controls').prepend( item ) + fullItem.find('.controls').prepend(item) # hide/show item if attribute.hide @@ -632,48 +628,49 @@ class App.ControllerForm extends App.Controller App.Log.error 'ControllerForm', 'no form found!', form form - @disable: (form) -> + @disable: (form, type = 'form') -> lookupForm = @findForm(form) - if lookupForm + if lookupForm && type is 'form' if lookupForm.is('button, input, select, textarea, div, span') + console.log(2) App.Log.debug 'ControllerForm', 'disable item...', lookupForm - lookupForm.attr('readonly', true) - lookupForm.attr('disabled', true) + lookupForm.prop('readonly', true) + lookupForm.prop('disabled', true) return App.Log.debug 'ControllerForm', 'disable form...', lookupForm # set forms to read only during communication with backend - lookupForm.find('button, input, select, textarea').attr('readonly', true) + lookupForm.find('button, input, select, textarea').prop('readonly', true) # disable additionals submits - lookupForm.find('button').attr('disabled', true) + lookupForm.find('button').prop('disabled', true) else App.Log.debug 'ControllerForm', 'disable item...', form - form.attr('readonly', true) - form.attr('disabled', true) + form.prop('readonly', true) + form.prop('disabled', true) - @enable: (form) -> + @enable: (form, type = 'form') -> lookupForm = @findForm(form) - if lookupForm + if lookupForm && type is 'form' if lookupForm.is('button, input, select, textarea, div, span') App.Log.debug 'ControllerForm', 'disable item...', lookupForm - lookupForm.attr('readonly', false) - lookupForm.attr('disabled', false) + lookupForm.prop('readonly', false) + lookupForm.prop('disabled', false) return App.Log.debug 'ControllerForm', 'enable form...', lookupForm # enable fields again - lookupForm.find('button, input, select, textarea').attr('readonly', false) + lookupForm.find('button, input, select, textarea').prop('readonly', false) # enable submits again - lookupForm.find('button').attr('disabled', false) + lookupForm.find('button').prop('disabled', false) else App.Log.debug 'ControllerForm', 'enable item...', form - form.attr('readonly', false) - form.attr('disabled', false) + form.prop('readonly', false) + form.prop('disabled', false) @validate: (data) -> diff --git a/app/assets/javascripts/app/controllers/_application_controller_form_organization.coffee b/app/assets/javascripts/app/controllers/_application_controller_form_organization.coffee new file mode 100644 index 000000000000..2415a2cbb74f --- /dev/null +++ b/app/assets/javascripts/app/controllers/_application_controller_form_organization.coffee @@ -0,0 +1,10 @@ +class App.ControllerFormOrganization extends App.ControllerForm + constructor: (params) -> + @user = App.User.find(App.Session.get('id')) + @organizations = [] + if @user.organization_id + @organizations.push @user.organization_id + if @user.organization_ids + @organizations = @organizations.concat @user.organization_ids + params['filter']['organization_id'] = @organizations + super \ No newline at end of file diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee index 9a9855a45843..2f9bff2fc9db 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee @@ -545,6 +545,9 @@ class App.ControllerNavSidbar extends App.Controller sidebar: @$('.sidebar').scrollTop() class App.GenericHistory extends App.ControllerModal + @extend App.PopoverProvidable + @registerPopovers 'User' + buttonClose: true buttonCancel: false buttonSubmit: false @@ -568,7 +571,7 @@ class App.GenericHistory extends App.ControllerModal content onShown: => - @userPopups() + @renderPopovers() sortorder: => @items = @items.reverse() @@ -1403,4 +1406,4 @@ class App.ImportResult extends App.ControllerModal content onSubmit: (e) => - @close() \ No newline at end of file + @close() diff --git a/app/assets/javascripts/app/controllers/_application_controller_table.coffee b/app/assets/javascripts/app/controllers/_application_controller_table.coffee index d32477773108..6240cca77b36 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_table.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_table.coffee @@ -113,6 +113,7 @@ class App.ControllerTable extends App.Controller radio: false renderState: undefined groupBy: undefined + groupDirection: undefined shownPerPage: 150 shownPage: 0 @@ -771,6 +772,9 @@ class App.ControllerTable extends App.Controller for key of groupObjects groupsSorted.push key groupsSorted = groupsSorted.sort() + # Reverse the sorted groups depending on the groupDirection + if @groupDirection == 'DESC' + groupsSorted.reverse() # get new order localObjects = [] diff --git a/app/assets/javascripts/app/controllers/_channel/email.coffee b/app/assets/javascripts/app/controllers/_channel/email.coffee index e5e4ba32115c..6889e4c14819 100644 --- a/app/assets/javascripts/app/controllers/_channel/email.coffee +++ b/app/assets/javascripts/app/controllers/_channel/email.coffee @@ -60,68 +60,23 @@ class App.ChannelEmailFilter extends App.Controller new: (e) => e.preventDefault() - new App.ChannelEmailFilterEdit( + new App.ControllerGenericNew( + pageData: + object: 'Postmaster Filter' + genericObject: 'PostmasterFilter' container: @el.closest('.content') + callback: @load ) - + edit: (id, e) => e.preventDefault() - new App.ChannelEmailFilterEdit( - object: App.PostmasterFilter.find(id) + new App.ControllerGenericEdit( + id: id, + pageData: + object: 'Postmaster Filter' + genericObject: 'PostmasterFilter' container: @el.closest('.content') - ) - -class App.ChannelEmailFilterEdit extends App.ControllerModal - buttonClose: true - buttonCancel: true - buttonSubmit: true - head: 'Postmaster Filter' - - content: => - if @object - @form = new App.ControllerForm( - model: App.PostmasterFilter, - params: @object, - autofocus: true, - ) - else - @form = new App.ControllerForm( - model: App.PostmasterFilter, - autofocus: true, - ) - - @form.form - - onSubmit: (e) => - e.preventDefault() - - # get params - params = @formParam(e.target) - params['channel'] = 'email' - - object = @object || new App.PostmasterFilter - object.load(params) - - # validate form - errors = @form.validate(params) - - # show errors in form - if errors - @log 'error', errors - @formValidate(form: e.target, errors: errors) - return false - - # disable form - @formDisable(e) - - # save object - object.save( - done: => - @close() - fail: (settings, details) => - @log 'errors', details - @formEnable(e) - @form.showAlert(details.error_human || details.error || 'Unable to create object!') + callback: @load ) class App.ChannelEmailSignature extends App.Controller diff --git a/app/assets/javascripts/app/controllers/_ui_element/_application_ui_element.coffee b/app/assets/javascripts/app/controllers/_ui_element/_application_ui_element.coffee index cc272b47f43b..546d3e29b605 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/_application_ui_element.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/_application_ui_element.coffee @@ -52,11 +52,9 @@ class App.UiElement.ApplicationUiElement row.name = App.i18n.translateInline(row.name) attribute.options.push row else - order = _.sortBy( - _.keys(selection), (item) -> - return '' if !selection[item] || !selection[item].toString - selection[item].toString().toLowerCase() - ) + forceString = (s) -> + return if !selection[s] || !selection[s].toString then '' else selection[s].toString() + order = _.keys(selection).sort( (a, b) -> forceString(a).localeCompare(forceString(b)) ) for key in order name_new = selection[key] if attribute.translate diff --git a/app/assets/javascripts/app/controllers/_ui_element/autocompletion_multiple_ajax.coffee b/app/assets/javascripts/app/controllers/_ui_element/autocompletion_multiple_ajax.coffee new file mode 100644 index 000000000000..48ec08a4dbbd --- /dev/null +++ b/app/assets/javascripts/app/controllers/_ui_element/autocompletion_multiple_ajax.coffee @@ -0,0 +1,19 @@ +class App.UiElement.autocompletion_multiple_ajax + @render: (attribute, params = {}) -> + if params[attribute.name]?.length > 0 || attribute.value?.length > 0 + object = App[attribute.relation].find(params[attribute.name][0] || attribute.value[0]) + valueName = object.displayName() + + # selectable search + searchableAjaxSelectObject = new App.SearchableMultipleSelect( + attribute: + value: params[attribute.name] || attribute.value + valueName: valueName + name: attribute.name + id: attribute.value + placeholder: App.i18n.translateInline('Search...') + limit: 40 + object: attribute.relation + ajax: true + ) + searchableAjaxSelectObject.element() \ No newline at end of file diff --git a/app/assets/javascripts/app/controllers/_ui_element/basedate.coffee b/app/assets/javascripts/app/controllers/_ui_element/basedate.coffee new file mode 100644 index 000000000000..2603e6a1011e --- /dev/null +++ b/app/assets/javascripts/app/controllers/_ui_element/basedate.coffee @@ -0,0 +1,156 @@ +# coffeelint: disable=camel_case_classes +# Base class for providing date picker. Must be extended +class App.UiElement.basedate + @templateName: -> + throw 'Must override in a subclass' + + @render: (attributeOrig) -> + attribute = _.clone(attributeOrig) + attribute.nameRaw = attribute.name + attribute.name = "{#{@templateName()}}#{attribute.name}" + + item = $( App.view("generic/#{@templateName()}")( + attribute: attribute + ) ) + + # set our custom template + $.fn.datepicker.defaults.template = App.view('generic/datepicker')() + + # apply date widgets + $.fn.datepicker.dates['custom'] = @buildCustomDates() + + @applyPickers(item, attribute) + @bindEvents(item, attribute) + + item + + @log: (name, args...) -> + App.Log.debug "Ui.element.#{@templateName()}.#{name}", args... + + @applyPickers: (item, attribute) -> + item.find('.js-datepicker').datepicker( + weekStart: 1 + autoclose: true + todayBtn: 'linked' + todayHighlight: true + format: App.i18n.timeFormat().date + rtl: App.i18n.dir() is 'rtl' + container: item + language: 'custom' + ) + + @setNewTimeInitial(item, attribute) + + # observer changes / update needed to forece rerender to get correct today shown + @bindEvents: (item, attribute) -> + item + .find('input') + .bind('focus', (e) -> + item.find('.js-datepicker').datepicker('rerender') + ).bind('keyup blur change', (e) => + @setNewTime(item, attribute, 0) + @validation(item, attribute, true) + ) + + item.bind('validate', (e) => + @validation(item, attribute) + ) + + @setNewTime: (item, attribute, tolerant = false) -> + currentInput = @currentInput(item, attribute) + return if !currentInput + + if !@validateInput(currentInput) + item.find("[name=\"#{attribute.name}\"]").val('') + return + + item.find("[name=\"#{attribute.name}\"]").val(@buildTimestamp(currentInput)) + + # returns array with date or false if cannot get date + @currentInput: (item, attribute) -> + datetime = item.find('.js-datepicker').datepicker('getDate') + if !datetime || datetime.toString() is 'Invalid Date' + item.find("[name=\"#{attribute.name}\"]").val('') + return false + + @log 'setNewTime', datetime + + year = datetime.getFullYear() + month = datetime.getMonth() + 1 + day = datetime.getDate() + date = "#{App.Utils.formatTime(year)}-#{App.Utils.formatTime(month,2)}-#{App.Utils.formatTime(day,2)}" + [date] + + @validateInput: (currentInput) -> + currentInput[0] isnt '' + + @buildTimestamp: (currentInput) -> + throw 'Must override in a subclass' + + @dateSetter: -> + throw 'Must override in a subclass' + + @setNewTimeInitial: (item, attribute) -> + timestamp = item.find("[name=\"#{attribute.name}\"]").val() + @log 'setNewTimeInitial', timestamp + if !timestamp + @setNoTimestamp(item) + return + + timeObject = new Date( Date.parse( timestamp ) ) + + @log 'setNewTimeInitial', timestamp, timeObject + @setTimestamp(item, timeObject) + item.find('.js-datepicker').datepicker('update') + + @setNoTimestamp: (item) -> + return + + @setTimestamp: (item, timeObject) -> + item.find('.js-datepicker').datepicker(@dateSetter(), timeObject) + + @validation: (item, attribute, runtime) -> + # remove old validation + if attribute.validationContainer is 'self' + item.find('.js-datepicker').removeClass('has-error') + else + item.closest('.form-group').removeClass('has-error') + item.find('.has-error').removeClass('has-error') + item.find('.help-inline').html('') + item.closest('.form-group').find('.help-inline').html('') + + timestamp = item.find("[name=\"#{attribute.name}\"]").val() + + # check required attributes + errors = {} + if !timestamp + if !attribute.null + errors[attribute.name] = 'missing' + else + timeObject = new Date( Date.parse( timestamp ) ) + + + @log 'validation', errors + return if _.isEmpty(errors) + + # show invalid options + if attribute.validationContainer is 'self' + item.find('.js-datepicker').addClass('has-error') + else + formGroup = item.closest('.form-group') + for key, value of errors + formGroup.addClass('has-error') + + @buildCustomDates: -> + data = { + days: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'], + daysMin: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], + daysShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], + months: ['January', 'February', 'March', 'April', 'May', 'June', + 'July', 'August', 'September', 'October', 'November', 'December'], + monthsShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], + today: 'today', + clear: 'clear' + } + + App.i18n.translateDeep(data) diff --git a/app/assets/javascripts/app/controllers/_ui_element/date.coffee b/app/assets/javascripts/app/controllers/_ui_element/date.coffee index e70a6d8347dd..0e48d3041afc 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/date.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/date.coffee @@ -1,161 +1,11 @@ # coffeelint: disable=camel_case_classes -class App.UiElement.date - @render: (attributeOrig) -> +# Provides date-only picker +class App.UiElement.date extends App.UiElement.basedate + @templateName: -> + 'date' - attribute = _.clone(attributeOrig) - attribute.nameRaw = attribute.name - attribute.name = "{date}#{attribute.name}" + @buildTimestamp: (currentInput) -> + currentInput[0] - item = $( App.view('generic/date')( - attribute: attribute - ) ) - - # set our custom template - $.fn.datepicker.defaults.template = App.view('generic/datepicker')() - - # apply date widgets - $.fn.datepicker.dates['custom'] = - days: [ - App.i18n.translateInline('Sunday'), - App.i18n.translateInline('Monday'), - App.i18n.translateInline('Tuesday'), - App.i18n.translateInline('Wednesday'), - App.i18n.translateInline('Thursday'), - App.i18n.translateInline('Friday'), - App.i18n.translateInline('Saturday'), - App.i18n.translateInline('Sunday'), - ], - daysMin: [ - App.i18n.translateInline('Sun'), - App.i18n.translateInline('Mon'), - App.i18n.translateInline('Tue'), - App.i18n.translateInline('Wed'), - App.i18n.translateInline('Thu'), - App.i18n.translateInline('Fri'), - App.i18n.translateInline('Sat'), - App.i18n.translateInline('Sun') - ], - daysShort: [ - App.i18n.translateInline('Sun'), - App.i18n.translateInline('Mon'), - App.i18n.translateInline('Tue'), - App.i18n.translateInline('Wed'), - App.i18n.translateInline('Thu'), - App.i18n.translateInline('Fri'), - App.i18n.translateInline('Sat'), - App.i18n.translateInline('Sun') - ], - months: [ - App.i18n.translateInline('January'), - App.i18n.translateInline('February'), - App.i18n.translateInline('March'), - App.i18n.translateInline('April'), - App.i18n.translateInline('May'), - App.i18n.translateInline('June'), - App.i18n.translateInline('July'), - App.i18n.translateInline('August'), - App.i18n.translateInline('September'), - App.i18n.translateInline('October'), - App.i18n.translateInline('November'), - App.i18n.translateInline('December'), - ], - monthsShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], - today: App.i18n.translateInline('today'), - clear: App.i18n.translateInline('clear') - currentDate = undefined - - item.find('.js-datepicker').datepicker( - weekStart: 1 - autoclose: true - todayBtn: 'linked' - todayHighlight: true - format: App.i18n.timeFormat().date - rtl: App.i18n.dir() is 'rtl' - container: item - language: 'custom' - ) - - # set initial date time - @setNewTimeInitial(item, attribute) - - # observer changes / update needed to forece rerender to get correct today shown - item.find('input').bind('focus', (e) -> - item.find('.js-datepicker').datepicker('rerender') - ) - item.find('input').bind('keyup blur change', (e) => - @setNewTime(item, attribute, 0) - @validation(item, attribute, true) - ) - item.bind('validate', (e) => - @validation(item, attribute) - ) - - item - - @setNewTime: (item, attribute, tolerant = false) -> - - datetime = item.find('.js-datepicker').datepicker('getDate') - if !datetime || datetime.toString() is 'Invalid Date' - App.Log.debug 'UiElement.date.setNewTime', datetime - item.find("[name=\"#{attribute.name}\"]").val('') - return - - App.Log.debug 'UiElement.date.setNewTime', datetime - year = datetime.getFullYear() - month = datetime.getMonth() + 1 - day = datetime.getDate() - date = "#{App.Utils.formatTime(year)}-#{App.Utils.formatTime(month,2)}-#{App.Utils.formatTime(day,2)}" - - if date is '' - item.find("[name=\"#{attribute.name}\"]").val('') - return - - App.Log.debug 'UiElement.date.setNewTime', date - item.find("[name=\"#{attribute.name}\"]").val(date) - - @setNewTimeInitial: (item, attribute) -> - App.Log.debug 'UiElement.date.setNewTimeInitial', timestamp - timestamp = item.find("[name=\"#{attribute.name}\"]").val() - return if !timestamp - - timeObject = new Date( Date.parse( timestamp ) ) - - hour = timeObject.getHours() - minute = timeObject.getMinutes() - - App.Log.debug 'UiElement.date.setNewTimeInitial', timestamp, timeObject - item.find('.js-datepicker').datepicker('setUTCDate', timeObject) - item.find('.js-datepicker').datepicker('update') - - @validation: (item, attribute, runtime) -> - - # remove old validation - if attribute.validationContainer is 'self' - item.find('.js-datepicker').removeClass('has-error') - else - item.closest('.form-group').removeClass('has-error') - item.find('.has-error').removeClass('has-error') - item.find('.help-inline').html('') - item.closest('.form-group').find('.help-inline').html('') - - timestamp = item.find("[name=\"#{attribute.name}\"]").val() - - # check required attributes - errors = {} - if !timestamp - if !attribute.null - errors[attribute.name] = 'missing' - else - timeObject = new Date( Date.parse( timestamp ) ) - - - App.Log.debug 'UiElement.date.validation', errors - return if _.isEmpty(errors) - - # show invalid options - if attribute.validationContainer is 'self' - item.find('.js-datepicker').addClass('has-error') - else - formGroup = item.closest('.form-group') - for key, value of errors - formGroup.addClass('has-error') + @dateSetter: -> + 'setUTCDate' diff --git a/app/assets/javascripts/app/controllers/_ui_element/datetime.coffee b/app/assets/javascripts/app/controllers/_ui_element/datetime.coffee index 6e8397572a34..648aa9981e92 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/datetime.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/datetime.coffee @@ -1,174 +1,45 @@ # coffeelint: disable=camel_case_classes -class App.UiElement.datetime - @render: (attributeOrig) -> +# Provides full date and time picker +class App.UiElement.datetime extends App.UiElement.basedate + @templateName: -> + 'datetime' - attribute = _.clone(attributeOrig) - attribute.nameRaw = attribute.name - attribute.name = "{datetime}#{attribute.name}" + @applyPickers: (item, attribute) -> + super(item, attribute) - item = $( App.view('generic/datetime')( - attribute: attribute - ) ) - - # set our custom template - $.fn.datepicker.defaults.template = App.view('generic/datepicker')() - - # apply date widgets - $.fn.datepicker.dates['custom'] = - days: [ - App.i18n.translateInline('Sunday'), - App.i18n.translateInline('Monday'), - App.i18n.translateInline('Tuesday'), - App.i18n.translateInline('Wednesday'), - App.i18n.translateInline('Thursday'), - App.i18n.translateInline('Friday'), - App.i18n.translateInline('Saturday'), - App.i18n.translateInline('Sunday'), - ], - daysMin: [ - App.i18n.translateInline('Sun'), - App.i18n.translateInline('Mon'), - App.i18n.translateInline('Tue'), - App.i18n.translateInline('Wed'), - App.i18n.translateInline('Thu'), - App.i18n.translateInline('Fri'), - App.i18n.translateInline('Sat'), - App.i18n.translateInline('Sun') - ], - daysShort: [ - App.i18n.translateInline('Sun'), - App.i18n.translateInline('Mon'), - App.i18n.translateInline('Tue'), - App.i18n.translateInline('Wed'), - App.i18n.translateInline('Thu'), - App.i18n.translateInline('Fri'), - App.i18n.translateInline('Sat'), - App.i18n.translateInline('Sun') - ], - months: [ - App.i18n.translateInline('January'), - App.i18n.translateInline('February'), - App.i18n.translateInline('March'), - App.i18n.translateInline('April'), - App.i18n.translateInline('May'), - App.i18n.translateInline('June'), - App.i18n.translateInline('July'), - App.i18n.translateInline('August'), - App.i18n.translateInline('September'), - App.i18n.translateInline('October'), - App.i18n.translateInline('November'), - App.i18n.translateInline('December'), - ], - monthsShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], - today: App.i18n.translateInline('today'), - clear: App.i18n.translateInline('clear') - currentDate = undefined - - item.find('.js-datepicker').datepicker( - weekStart: 1 - autoclose: true - todayBtn: 'linked' - todayHighlight: true - format: App.i18n.timeFormat().date - rtl: App.i18n.dir() is 'rtl' - container: item - language: 'custom' - ) - - # set initial date time - @setNewTimeInitial(item, attribute) - - # apply time widgets item.find('.js-timepicker').timepicker() - # observer changes / update needed to forece rerender to get correct today shown - item.find('input').bind('focus', (e) -> - item.find('.js-datepicker').datepicker('rerender') - ) - item.find('input').bind('keyup blur change', (e) => - @setNewTime(item, attribute, 0) - @validation(item, attribute, true) - ) - item.bind('validate', (e) => - @validation(item, attribute) - ) - item + # returns array with date and time or false if cannot get date + @currentInput: (item, attribute) -> + result = super(item, attribute) - @setNewTime: (item, attribute, tolerant = false) -> + if _.isArray(result) + result.push item.find('.js-timepicker').val() - datetime = item.find('.js-datepicker').datepicker('getDate') - if !datetime || datetime.toString() is 'Invalid Date' - App.Log.debug 'UiElement.datetime.setNewTime', datetime - item.find("[name=\"#{attribute.name}\"]").val('') - return + result - App.Log.debug 'UiElement.datetime.setNewTime', datetime - year = datetime.getFullYear() - month = datetime.getMonth() + 1 - day = datetime.getDate() - date = "#{App.Utils.formatTime(year)}-#{App.Utils.formatTime(month,2)}-#{App.Utils.formatTime(day,2)}" - time = item.find('.js-timepicker').val() - - if date is '' || time is '' - item.find("[name=\"#{attribute.name}\"]").val('') - return - - timestamp = "#{date}T#{time}:00.000Z" - time = new Date( Date.parse(timestamp) ) - time.setMinutes( time.getMinutes() + time.getTimezoneOffset() ) - App.Log.debug 'UiElement.datetime.setNewTime', time.toString() - timestamp = time.toISOString().replace(/\d\d\.\d\d\dZ$/, '00.000Z') - item.find("[name=\"#{attribute.name}\"]").val(timestamp) + @validateInput: (currentInput) -> + currentInput[0] isnt '' || currentInput[1] isnt '' - @setNewTimeInitial: (item, attribute) -> - App.Log.debug 'UiElement.datetime.setNewTimeInitial', timestamp - timestamp = item.find("[name=\"#{attribute.name}\"]").val() - if !timestamp - item.find('.js-timepicker').val('08:00') - return + @setNoTimestamp: (item) -> + item.find('.js-timepicker').val('08:00') - timeObject = new Date( Date.parse( timestamp ) ) + @setTimestamp: (item, timeObject) -> + super(item, timeObject) hour = timeObject.getHours() minute = timeObject.getMinutes() time = "#{App.Utils.formatTime(hour,2)}:#{App.Utils.formatTime(minute,2)}" - App.Log.debug 'UiElement.datetime.setNewTimeInitial', timestamp, timeObject - item.find('.js-datepicker').datepicker('setUTCDate', timeObject) item.find('.js-timepicker').val(time) - item.find('.js-datepicker').datepicker('update') - - @validation: (item, attribute, runtime) -> - - # remove old validation - if attribute.validationContainer is 'self' - item.find('.js-datepicker').removeClass('has-error') - else - item.closest('.form-group').removeClass('has-error') - item.find('.has-error').removeClass('has-error') - item.find('.help-inline').html('') - item.closest('.form-group').find('.help-inline').html('') - - timestamp = item.find("[name=\"#{attribute.name}\"]").val() - - # check required attributes - errors = {} - if !timestamp - if !attribute.null - errors[attribute.name] = 'missing' - else - timeObject = new Date( Date.parse( timestamp ) ) - - App.Log.debug 'UiElement.datetime.validation', errors - return if _.isEmpty(errors) - - # show invalid options - if attribute.validationContainer is 'self' - item.find('.js-datepicker').addClass('has-error') - else - formGroup = item.closest('.form-group') - for key, value of errors - formGroup.addClass('has-error') + @buildTimestamp: (currentInput) -> + timestamp = "#{currentInput[0]}T#{currentInput[1]}:00.000Z" + time = new Date( Date.parse(timestamp) ) + time.setMinutes( time.getMinutes() + time.getTimezoneOffset() ) + @log 'setNewTime', time.toString() + time.toISOString().replace(/\d\d\.\d\d\dZ$/, '00.000Z') + @dateSetter: -> + 'setDate' diff --git a/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee b/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee index 71fd11be64db..99ae033f6187 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee @@ -7,6 +7,10 @@ class App.UiElement.object_manager_attribute extends App.UiElement.ApplicationUi if params.data_option_new && !_.isEmpty(params.data_option_new) params.data_option = params.data_option_new + if attribute.value == 'select' && params.data_option? && params.data_option.options? + sorted = _.map params.data_option.options, (value, key) -> [key.toString(), value.toString()] + params.data_option.sorted = sorted.sort( (a, b) -> a[1].localeCompare(b[1]) ) + item = $(App.view('object_manager/attribute')(attribute: attribute)) updateDataMap = (localParams, localAttribute, localAttributes, localClassname, localForm, localA) => diff --git a/app/assets/javascripts/app/controllers/_ui_element/postmaster_set.coffee b/app/assets/javascripts/app/controllers/_ui_element/postmaster_set.coffee index 25e29568a413..b3803ed49577 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/postmaster_set.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/postmaster_set.coffee @@ -72,10 +72,7 @@ class App.UiElement.postmaster_set elements = {} for groupKey, groupMeta of groups - if !App[groupMeta.model] - elements["#{groupKey}.email"] = { name: 'email', display: 'Email' } - else - + if groupMeta.model && App[groupMeta.model] for row in App[groupMeta.model].configure_attributes # ignore passwords and relations @@ -117,32 +114,39 @@ class App.UiElement.postmaster_set [elements, groups] + @placeholder: (elementFull, attribute, params = {}, groups) -> + item = $( App.view('generic/postmaster_set_row')( attribute: attribute ) ) + selector = @buildAttributeSelector(elementFull, groups, attribute, item) + item.find('.js-attributeSelector').prepend(selector) + item + @render: (attribute, params = {}) -> [elements, groups] = @defaults() - selector = @buildAttributeSelector(groups, attribute) - # scaffold of match elements item = $( App.view('generic/postmaster_set')( attribute: attribute ) ) - item.find('.js-attributeSelector').prepend(selector) # add filter - item.find('.js-add').bind('click', (e) -> + item.on('click', '.js-add', (e) => element = $(e.target).closest('.js-filterElement') - elementClone = element.clone(true) - element.after(elementClone) - elementClone.find('.js-attributeSelector select').trigger('change') + placeholder = @placeholder(item, attribute, params, groups) + if element.get(0) + element.after(placeholder) + else + item.append(placeholder) + placeholder.find('.js-attributeSelector select').trigger('change') ) # remove filter - item.find('.js-remove').bind('click', (e) => + item.on('click', '.js-remove', (e) => + return if $(e.currentTarget).hasClass('is-disabled') $(e.target).closest('.js-filterElement').remove() @rebuildAttributeSelectors(item) ) # change attribute selector - item.find('.js-attributeSelector select').bind('change', (e) => + item.on('change', '.js-attributeSelector select', (e) => key = $(e.target).find('option:selected').attr('value') elementRow = $(e.target).closest('.js-filterElement') groupAndAttribute = elementRow.find('.js-attributeSelector option:selected').attr('value') @@ -152,27 +156,20 @@ class App.UiElement.postmaster_set ) # build inital params - if !_.isEmpty(params[attribute.name]) - - selectorExists = false - for key, meta of params[attribute.name] - selectorExists = true - operator = meta.operator - value = meta.value + if _.isEmpty(params[attribute.name]) + item.append(@placeholder(item, attribute, params, groups)) + return item - # get selector rows - elementFirst = item.find('.js-filterElement').first() - elementLast = item.find('.js-filterElement').last() + for key, meta of params[attribute.name] + operator = meta.operator + value = meta.value - # clone, rebuild and append - elementClone = elementFirst.clone(true) - @rebuildAttributeSelectors(item, elementClone, key, attribute) - @buildValue(item, elementClone, key, groups, value, operator, attribute) - elementLast.after(elementClone) + # build and append + element = @placeholder(item, attribute, params, groups) + @rebuildAttributeSelectors(item, element, key, attribute) + @buildValue(item, element, key, groups, value, operator, attribute) - # remove first dummy row - if selectorExists - item.find('.js-filterElement').first().remove() + item.append(element) item @@ -197,7 +194,15 @@ class App.UiElement.postmaster_set item = App.UiElement[config.tag].render(config, {}) elementRow.find('.js-value').html(item) - @buildAttributeSelector: (groups, attribute) -> + @buildAttributeSelector: (elementFull, groups, attribute) -> + + # find first possible attribute + selectedValue = '' + elementFull.find('.js-attributeSelector select option').each(-> + if !selectedValue && !$(@).prop('disabled') + selectedValue = $(@).val() + ) + selection = $('') for groupKey, groupMeta of groups displayName = App.i18n.translateInline(groupMeta.name) @@ -205,7 +210,10 @@ class App.UiElement.postmaster_set optgroup = selection.find("optgroup.js-#{groupKey}") for entry in groupMeta.options displayName = App.i18n.translateInline(entry.name) - optgroup.append("") + selected = '' + if entry.value is selectedValue + selected = 'selected="selected"' + optgroup.append("") selection @rebuildAttributeSelectors: (elementFull, elementRow, key, attribute) -> @@ -240,11 +248,11 @@ class App.UiElement.postmaster_set selection = $("") attributeConfig = elements[groupAndAttribute] - if !attributeConfig.operator + if !attributeConfig || !attributeConfig.operator elementRow.find('.js-operator').addClass('hide') else elementRow.find('.js-operator').removeClass('hide') - if attributeConfig.operator + if attributeConfig && attributeConfig.operator for operator in attributeConfig.operator operatorName = App.i18n.translateInline(operator) selected = '' diff --git a/app/assets/javascripts/app/controllers/_ui_element/richtext.coffee b/app/assets/javascripts/app/controllers/_ui_element/richtext.coffee index 387a35a8f1d2..b43483c3190b 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/richtext.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/richtext.coffee @@ -73,12 +73,14 @@ class App.UiElement.richtext @attachmentPlaceholder.addClass('hide') @attachmentUpload.removeClass('hide') @cancelContainer.removeClass('hide') + item.find('[contenteditable]').trigger('fileUploadStart') App.Log.debug 'UiElement.richtext', 'upload start' onAborted: => @attachmentPlaceholder.removeClass('hide') @attachmentUpload.addClass('hide') item.find('input').val('') + item.find('[contenteditable]').trigger('fileUploadStop', ['aborted']) # Called after received response from the server onCompleted: (response) => @@ -93,7 +95,7 @@ class App.UiElement.richtext renderFile(response.data) item.find('input').val('') - + item.find('[contenteditable]').trigger('fileUploadStop', ['completed']) App.Log.debug 'UiElement.richtext', 'upload complete', response.data # Called during upload progress, first parameter diff --git a/app/assets/javascripts/app/controllers/_ui_element/select.coffee b/app/assets/javascripts/app/controllers/_ui_element/select.coffee index da812722e4fb..e8dbdf1b38c5 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/select.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/select.coffee @@ -8,6 +8,9 @@ class App.UiElement.select extends App.UiElement.ApplicationUiElement else attribute.multiple = '' + # add deleted historical options if required + @addDeletedOptions(attribute, params) + # build options list based on config @getConfigOptionList(attribute, params) @@ -31,3 +34,20 @@ class App.UiElement.select extends App.UiElement.ApplicationUiElement # return item $( App.view('generic/select')(attribute: attribute) ) + + # 1. If attribute.value is not among the current options, then search within historical options + # 2. If attribute.value is not among current and historical options, then add the value itself as an option + @addDeletedOptions: (attribute) -> + return if !_.isEmpty(attribute.relation) # do not apply for attributes with relation, relations will fill options automatically + value = attribute.value + return if !value + return if _.isArray(value) + return if !attribute.options + return if !_.isObject(attribute.options) + return if value of attribute.options + return if value in (temp for own prop, temp of attribute.options) + + if attribute.historical_options && value of attribute.historical_options + attribute.options[value] = attribute.historical_options[value] + else + attribute.options[value] = value diff --git a/app/assets/javascripts/app/controllers/_ui_element/select_organization.coffee b/app/assets/javascripts/app/controllers/_ui_element/select_organization.coffee new file mode 100644 index 000000000000..6f8f4ea760ee --- /dev/null +++ b/app/assets/javascripts/app/controllers/_ui_element/select_organization.coffee @@ -0,0 +1,5 @@ +class App.UiElement.select_organization extends App.UiElement.select + @render: (attribute, params) -> + if attribute['default'] == 0 + attribute['default'] = attribute['filter']&[0] + super(attribute, params) \ No newline at end of file diff --git a/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee b/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee index 8ca71006a923..f9ac78d3e5c5 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee @@ -16,7 +16,7 @@ class App.UiElement.ticket_perform_action # megre config elements = {} for groupKey, groupMeta of groups - if !App[groupMeta.model] + if !groupMeta.model || !App[groupMeta.model] elements["#{groupKey}.email"] = { name: 'email', display: 'Email' } else @@ -45,92 +45,82 @@ class App.UiElement.ticket_perform_action [defaults, groups, elements] + @placeholder: (elementFull, attribute, params, groups, elements) -> + item = $( App.view('generic/ticket_perform_action/row')( attribute: attribute ) ) + selector = @buildAttributeSelector(elementFull, groups, elements) + item.find('.js-attributeSelector').prepend(selector) + item + @render: (attribute, params = {}) -> [defaults, groups, elements] = @defaults(attribute) - selector = @buildAttributeSelector(groups, elements) - # return item item = $( App.view('generic/ticket_perform_action/index')( attribute: attribute ) ) - item.find('.js-attributeSelector').prepend(selector) # add filter - item.find('.js-add').bind('click', (e) => + item.on('click', '.js-add', (e) => element = $(e.target).closest('.js-filterElement') - elementClone = element.clone(true) - element.after(elementClone) - elementClone.find('.js-attributeSelector select').trigger('change') + placeholder = @placeholder(item, attribute, params, groups, elements) + if element.get(0) + element.after(placeholder) + else + item.append(placeholder) + placeholder.find('.js-attributeSelector select').trigger('change') @updateAttributeSelectors(item) ) # remove filter - item.find('.js-remove').bind('click', (e) => + item.on('click', '.js-remove', (e) => return if $(e.currentTarget).hasClass('is-disabled') $(e.target).closest('.js-filterElement').remove() @updateAttributeSelectors(item) ) # change attribute selector - item.find('.js-attributeSelector select').bind('change', (e) => + item.on('change', '.js-attributeSelector select', (e) => elementRow = $(e.target).closest('.js-filterElement') groupAndAttribute = elementRow.find('.js-attributeSelector option:selected').attr('value') @rebuildAttributeSelectors(item, elementRow, groupAndAttribute, elements, {}, attribute) @updateAttributeSelectors(item) ) - # build inital params - if !_.isEmpty(params[attribute.name]) - - selectorExists = false - for groupAndAttribute, meta of params[attribute.name] - selectorExists = true - - # get selector rows - elementFirst = item.find('.js-filterElement').first() - elementLast = item.find('.js-filterElement').last() - - # clone, rebuild and append - elementClone = elementFirst.clone(true) - @rebuildAttributeSelectors(item, elementClone, groupAndAttribute, elements, meta, attribute) - elementLast.after(elementClone) + # change operator selector + item.on('change', '.js-operator select', (e) => + elementRow = $(e.target).closest('.js-filterElement') + groupAndAttribute = elementRow.find('.js-attributeSelector option:selected').attr('value') + @buildOperator(item, elementRow, groupAndAttribute, elements, {}, attribute) + ) - # remove first dummy row - if selectorExists - item.find('.js-filterElement').first().remove() + # build inital params + if _.isEmpty(params[attribute.name]) - else for groupAndAttribute in defaults - # get selector rows - elementFirst = item.find('.js-filterElement').first() - elementLast = item.find('.js-filterElement').last() + # build and append + element = @placeholder(item, attribute, params, groups, elements) + item.append(element) + @rebuildAttributeSelectors(item, element, groupAndAttribute, elements, {}, attribute) - # clone, rebuild and append - elementClone = elementFirst.clone(true) - @rebuildAttributeSelectors(item, elementClone, groupAndAttribute, elements, {}, attribute) + return item - elementLast.after(elementClone) - item.find('.js-filterElement').first().remove() + for groupAndAttribute, meta of params[attribute.name] - # change attribute selector - item.find('.js-attributeSelector select').bind('change', (e) => - elementRow = $(e.target).closest('.js-filterElement') - groupAndAttribute = elementRow.find('.js-attributeSelector option:selected').attr('value') - @rebuildAttributeSelectors(item, elementRow, groupAndAttribute, elements, {}, attribute) - @updateAttributeSelectors(item) - ) + # build and append + element = @placeholder(item, attribute, params, groups, elements) + @rebuildAttributeSelectors(item, element, groupAndAttribute, elements, meta, attribute) + item.append(element) + item - # change operator selector - item.on('change', '.js-operator select', (e) => - elementRow = $(e.target).closest('.js-filterElement') - groupAndAttribute = elementRow.find('.js-attributeSelector option:selected').attr('value') - @buildOperator(item, elementRow, groupAndAttribute, elements, {}, attribute) - ) + @buildAttributeSelector: (elementFull, groups, elements) -> - item + # find first possible attribute + selectedValue = '' + elementFull.find('.js-attributeSelector select option').each(-> + if !selectedValue && !$(@).prop('disabled') + selectedValue = $(@).val() + ) - @buildAttributeSelector: (groups, elements) -> selection = $('') for groupKey, groupMeta of groups displayName = App.i18n.translateInline(groupMeta.name) @@ -141,7 +131,11 @@ class App.UiElement.ticket_perform_action if spacer[0] is groupKey attributeConfig = elements[elementKey] displayName = App.i18n.translateInline(attributeConfig.display) - optgroup.append("") + + selected = '' + if elementKey is selectedValue + selected = 'selected="selected"' + optgroup.append("") selection @updateAttributeSelectors: (elementFull) -> @@ -191,11 +185,11 @@ class App.UiElement.ticket_perform_action selection = $("") attributeConfig = elements[groupAndAttribute] - if !attributeConfig.operator + if !attributeConfig || !attributeConfig.operator elementRow.find('.js-operator').addClass('hide') else elementRow.find('.js-operator').removeClass('hide') - if attributeConfig.operator + if attributeConfig && attributeConfig.operator for operator in attributeConfig.operator operatorName = App.i18n.translateInline(operator) selected = '' diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.coffee index fc202802db2b..d16d113d1e80 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.coffee @@ -256,6 +256,8 @@ class App.TicketCreate extends App.Controller params = template.options else if App.TaskManager.get(@taskKey) && !_.isEmpty(App.TaskManager.get(@taskKey).state) params = App.TaskManager.get(@taskKey).state + params.attachments = App.TaskManager.get(@taskKey).attachments + if !_.isEmpty(params['form_id']) @formId = params['form_id'] @@ -308,6 +310,9 @@ class App.TicketCreate extends App.Controller form_id: @formId model: App.TicketArticle screen: 'create_top' + events: + 'fileUploadStart .richtext': => @submitDisable() + 'fileUploadStop .richtext': => @submitEnable() params: params taskKey: @taskKey ) @@ -503,8 +508,12 @@ class App.TicketCreate extends App.Controller if !confirm(App.i18n.translateContent('You use %s in text but no attachment is attached. Do you want to continue?', matchingWord)) return + # add sidebar params + if @sidebarWidget && @sidebarWidget.postParams + @sidebarWidget.postParams(ticket: ticket) + # disable form - @formDisable(e) + @submitDisable(e) ui = @ ticket.save( done: -> @@ -536,7 +545,7 @@ class App.TicketCreate extends App.Controller fail: (settings, details) -> ui.log 'errors', details - ui.formEnable(e) + ui.submitEnable(e) ui.notify( type: 'error' msg: App.i18n.translateContent(details.error_human || details.error || 'Unable to create object!') @@ -544,6 +553,18 @@ class App.TicketCreate extends App.Controller ) ) + submitDisable: (e) => + if e + @formDisable(e) + return + @formDisable(@$('.js-submit'), 'button') + + submitEnable: (e) => + if e + @formEnable(e) + return + @formEnable(@$('.js-submit'), 'button') + class Router extends App.ControllerPermanent requiredPermission: 'ticket.agent' constructor: (params) -> diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar.coffee index 66f811ee3d9c..550467ebeb9e 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create/sidebar.coffee @@ -13,6 +13,11 @@ class App.TicketCreateSidebar extends App.Controller if backend && backend.commit backend.commit(args) + postParams: (args) => + for key, backend of @sidebarBackends + if backend && backend.postParams + backend.postParams(args) + render: (params) => if params @params = params diff --git a/app/assets/javascripts/app/controllers/cti.coffee b/app/assets/javascripts/app/controllers/cti.coffee index a637ad7e00ea..5ae318b38480 100644 --- a/app/assets/javascripts/app/controllers/cti.coffee +++ b/app/assets/javascripts/app/controllers/cti.coffee @@ -1,4 +1,7 @@ class App.CTI extends App.Controller + @extend App.PopoverProvidable + @registerPopovers 'User' + elements: '.js-callerLog': 'callerLog' events: @@ -25,6 +28,13 @@ class App.CTI extends App.Controller @delay(delay, 500, 'cti_list_push_render') 'cti_list_push' ) + @bind('cti_event', (data) => + return if data.state isnt 'newCall' + return if data.direction isnt 'in' + return if @switch() isnt true + @notify(data) + 'cti_event' + ) @bind('auth', (data) => @meta.counter = 0 ) @@ -71,6 +81,7 @@ class App.CTI extends App.Controller # render new caller list if data.list @list = data.list + @updateNavMenu() if @renderDone @renderCallerLog() return @@ -145,16 +156,17 @@ class App.CTI extends App.Controller if item.comment item.state_human += ", #{item.comment}" - if item.start && item.end - item.duration = format((Date.parse(item.end) - Date.parse(item.start))/1000) + if item.start_at && item.end_at + item.duration = format((Date.parse(item.end_at) - Date.parse(item.start_at))/1000) diff_in_min = ((Date.now() - Date.parse(item.created_at)) / 1000) / 60 if diff_in_min > 1 item.disabled = false - @userPopupsDestroy() + @removePopovers() @callerLog.html( App.view('cti/caller_log')(list: @list)) - @userPopups() + @renderPopovers() + @updateNavMenu() done: (e) => @@ -198,9 +210,9 @@ class App.CTI extends App.Controller counter: => count = 0 for item in @list - if item.state is 'hangup' && !item.done + if !item.done count++ - @meta.counter + count + @meta.counter = count switch: (state = undefined) => diff --git a/app/assets/javascripts/app/controllers/customer_ticket_create.coffee b/app/assets/javascripts/app/controllers/customer_ticket_create.coffee index d3ab6240d482..245454af6844 100644 --- a/app/assets/javascripts/app/controllers/customer_ticket_create.coffee +++ b/app/assets/javascripts/app/controllers/customer_ticket_create.coffee @@ -60,6 +60,9 @@ class Index extends App.ControllerContent form_id: @form_id model: App.TicketArticle screen: 'create_top' + events: + 'fileUploadStart .richtext': => @submitDisable() + 'fileUploadStop .richtext': => @submitEnable() filter: @formMeta.filter formMeta: @formMeta params: defaults @@ -141,6 +144,7 @@ class Index extends App.ControllerContent sender_id: sender.id form_id: @form_id content_type: 'text/html' + organization_id: params.organization_id } ticket.load(params) @@ -177,7 +181,7 @@ class Index extends App.ControllerContent else # disable form - @formDisable(e) + @submitDisable(e) ui = @ ticket.save( done: -> @@ -187,7 +191,7 @@ class Index extends App.ControllerContent fail: (settings, details) -> ui.log 'errors', details - ui.formEnable(e) + ui.submitEnable(e) ui.notify( type: 'error' msg: App.i18n.translateContent(details.error_human || details.error || 'Unable to create object!') @@ -195,5 +199,17 @@ class Index extends App.ControllerContent ) ) + submitDisable: (e) => + if e + @formDisable(e) + return + @formDisable(@$('.js-submit'), 'button') + + submitEnable: (e) => + if e + @formEnable(e) + return + @formEnable(@$('.js-submit'), 'button') + App.Config.set('customer_ticket_new', Index, 'Routes') App.Config.set('CustomerTicketNew', { prio: 8003, parent: '#new', name: 'New Ticket', translate: true, target: '#customer_ticket_new', permission: ['ticket.customer'], setting: ['customer_ticket_create'], divider: true }, 'NavBarRight') diff --git a/app/assets/javascripts/app/controllers/idoit_object_selector.coffee b/app/assets/javascripts/app/controllers/idoit_object_selector.coffee index 2a7053e5079f..d50519ba68ba 100644 --- a/app/assets/javascripts/app/controllers/idoit_object_selector.coffee +++ b/app/assets/javascripts/app/controllers/idoit_object_selector.coffee @@ -22,11 +22,11 @@ class App.IdoitObjectSelector extends App.ControllerModal @contentInline.find('.js-typeSelect').html(@renderTypeSelector(result)) - @contentInline.filter('.js-search').on('change', 'select, input', (e) => + @contentInline.on('change', 'input.js-shadow', (e) => params = @formParam(e.target) @search(params) ) - @contentInline.filter('.js-search').on('keyup', 'input', (e) => + @contentInline.on('keyup', 'input.js-searchField', (e) => params = @formParam(e.target) @search(params) ) diff --git a/app/assets/javascripts/app/controllers/navigation.coffee b/app/assets/javascripts/app/controllers/navigation.coffee index 55ad1234ceef..d3b0efbe69d7 100644 --- a/app/assets/javascripts/app/controllers/navigation.coffee +++ b/app/assets/javascripts/app/controllers/navigation.coffee @@ -1,4 +1,7 @@ class App.Navigation extends App.ControllerWidgetPermanent + @extend App.PopoverProvidable + @registerAllPopovers() + className: 'navigation vertical' elements: @@ -157,6 +160,7 @@ class App.Navigation extends App.ControllerWidgetPermanent ) renderResult: (result = []) => + @removePopovers() # remove result if not result exists if _.isEmpty(result) @@ -174,14 +178,7 @@ class App.Navigation extends App.ControllerWidgetPermanent # show result list @searchContainer.addClass('open') - # start ticket popups - @ticketPopups() - - # start user popups - @userPopups() - - # start oorganization popups - @organizationPopups() + @renderPopovers() render: -> @@ -206,7 +203,7 @@ class App.Navigation extends App.ControllerWidgetPermanent searchFocus: (e) => @query = '' # reset query cache @searchContainer.addClass('focused') - @anyPopoversDestroy() + App.PopoverProvidable.anyPopoversDestroy() @search() searchBlur: (e) => @@ -288,14 +285,14 @@ class App.Navigation extends App.ControllerWidgetPermanent @searchContainer.removeClass('filled').removeClass('open').removeClass('focused') @globalSearch.close() - # remove not needed popovers - @delay(@anyPopoversDestroy, 100, 'removePopovers') + @delayedRemoveAnyPopover() andClose: => @searchInput.blur() @searchContainer.removeClass('open') @globalSearch.close() - @delay(@anyPopoversDestroy, 100, 'removePopovers') + + @delayedRemoveAnyPopover() search: => query = @searchInput.val().trim() diff --git a/app/assets/javascripts/app/controllers/organization_profile.coffee b/app/assets/javascripts/app/controllers/organization_profile.coffee index d3ed34840b00..b4c5f59e3faa 100644 --- a/app/assets/javascripts/app/controllers/organization_profile.coffee +++ b/app/assets/javascripts/app/controllers/organization_profile.coffee @@ -195,6 +195,7 @@ class Member extends App.ObserverController lastname: true login: true email: true + active: true globalRerender: false render: (user) => diff --git a/app/assets/javascripts/app/controllers/report.coffee b/app/assets/javascripts/app/controllers/report.coffee index c8cc04620de7..51d9704cfb6c 100644 --- a/app/assets/javascripts/app/controllers/report.coffee +++ b/app/assets/javascripts/app/controllers/report.coffee @@ -550,9 +550,8 @@ class Sidebar extends App.Controller @render() render: => - metrics = @config.metric - profiles = App.ReportProfile.all() + profiles = App.ReportProfile.search(filter: { active: true }) @html App.view('report/sidebar')( metrics: metrics params: @params diff --git a/app/assets/javascripts/app/controllers/search.coffee b/app/assets/javascripts/app/controllers/search.coffee index 4c66dcf2f13e..acd4b492fbb9 100644 --- a/app/assets/javascripts/app/controllers/search.coffee +++ b/app/assets/javascripts/app/controllers/search.coffee @@ -1,4 +1,6 @@ class App.Search extends App.Controller + @extend App.PopoverProvidable + elements: '.js-search': 'searchInput' @@ -112,8 +114,7 @@ class App.Search extends App.Controller @updateFilledClass() @updateTask() - # remove not needed popovers - @delay(@anyPopoversDestroy, 100, 'removePopovers') + @delayedRemoveAnyPopover() search: (force = false) => query = @searchInput.val().trim() diff --git a/app/assets/javascripts/app/controllers/test.coffee b/app/assets/javascripts/app/controllers/test.coffee index 64fe57aeb692..c1886ff7926c 100644 --- a/app/assets/javascripts/app/controllers/test.coffee +++ b/app/assets/javascripts/app/controllers/test.coffee @@ -1,9 +1,10 @@ class App.TestController1 extends App.Controller constructor: -> super - @showState = false - @hideState = false - @activeState = false + @showState = false + @hideState = false + @activeState = false + @changedState ||= false @render() meta: -> @@ -21,6 +22,9 @@ class App.TestController1 extends App.Controller @activeState = state @render() + changed: => + @changedState + render: -> @html "
some test controller message:'#{@message}',show:'#{@showState}',hide:'#{@hideState}',active:'#{@activeState}'
" diff --git a/app/assets/javascripts/app/controllers/ticket_overview.coffee b/app/assets/javascripts/app/controllers/ticket_overview.coffee index 420f4e9f8dc5..1cd9cf4a0d54 100644 --- a/app/assets/javascripts/app/controllers/ticket_overview.coffee +++ b/app/assets/javascripts/app/controllers/ticket_overview.coffee @@ -1,3 +1,47 @@ +ValidUsersForTicketSelectionMethods = + validUsersForTicketSelection: -> + items = $('.content.active .table-overview .table').find('[name="bulk"]:checked') + + # we want to display all users for which we can assign the tickets directly + # for this we need to get the groups of all selected tickets + # after we got those we need to check which users are available in all groups + # users that are not in all groups can't get the tickets assigned + ticket_ids = _.map(items, (el) -> $(el).val() ) + ticket_group_ids = _.map(App.Ticket.findAll(ticket_ids), (ticket) -> ticket.group_id) + users = @usersInGroups(ticket_group_ids) + + # get the list of possible groups for the current user + # from the TicketCreateCollection + # (filled for e.g. the TicketCreation or TicketZoom assignment) + # and order them by name + group_ids = _.keys(@formMeta?.dependencies?.group_id) + groups = App.Group.findAll(group_ids) + groups_sorted = _.sortBy(groups, (group) -> group.name) + + # get the number of visible users per group + # from the TicketCreateCollection + # (filled for e.g. the TicketCreation or TicketZoom assignment) + for group in groups + group.valid_users_count = @formMeta?.dependencies?.group_id?[group.id]?.owner_id.length || 0 + + { + users: users + groups: groups_sorted + } + + usersInGroups: (group_ids) -> + ids_by_group = _.chain(@formMeta?.dependencies?.group_id) + .pick(group_ids) + .values() + .map( (e) -> e.owner_id) + .value() + + # Underscore's intersection doesn't work when chained + ids_in_all_groups = _.intersection(ids_by_group...) + + users = App.User.findAll(ids_in_all_groups) + _.sortBy(users, (user) -> user.firstname) + class App.TicketOverview extends App.Controller className: 'overviews' activeFocus: 'nav' @@ -25,6 +69,8 @@ class App.TicketOverview extends App.Controller 'mouseenter .js-batch-hover-target': 'highlightBatchEntry' 'mouseleave .js-batch-hover-target': 'unhighlightBatchEntry' + @include ValidUsersForTicketSelectionMethods + constructor: -> super @batchSupport = @permissionCheck('ticket.agent') @@ -34,6 +80,11 @@ class App.TicketOverview extends App.Controller @bind 'ui:rerender', => @renderBatchOverlay() + load = (data) => + App.Collection.loadAssets(data.assets) + @formMeta = data.form_meta + @bindId = App.TicketCreateCollection.bind(load) + startDragItem: (event) => return if !@batchSupport @grabbedItem = $(event.currentTarget) @@ -413,17 +464,10 @@ class App.TicketOverview extends App.Controller groupId = @hoveredBatchEntry.attr('data-id') group = App.Group.find(groupId) - users = [] - - for user_id in _.uniq(group.user_ids) - if App.User.exists(user_id) - user = App.User.find(user_id) - if user.active is true - users.push user @batchAssignGroupName.text group.displayName() @batchAssignGroupInner.html $(App.view('ticket_overview/batch_overlay_user_group')( - users: users + users: @usersInGroups([groupId]) groups: [] groupId: groupId )) @@ -589,47 +633,17 @@ class App.TicketOverview extends App.Controller @refreshElements() renderOptions: => - macros = App.Macro.findAllByAttribute('active', true) - groups = App.Group.findAllByAttribute('active', true) - users = [] - items = @el.find('[name="bulk"]:checked') - - # find all possible owners for selected tickets - possibleUsers = {} - possibleUserGroups = {} - for item in items - #console.log "selected items with id ", $(item).val() - ticket = App.Ticket.find($(item).val()) - if !possibleUserGroups[ticket.group_id.toString()] - group = App.Group.find(ticket.group_id) - for user_id in group.user_ids - if !possibleUserGroups[ticket.group_id.toString()] - possibleUsers[user_id.toString()] = true - else - hit = false - for user_id, exists of possibleUsers - if possibleUsers[user_id.toString()] - hit = true - if !hit - delete possibleUsers[user_id.toString()] - possibleUserGroups[ticket.group_id.toString()] = true - for user_id, _exists of possibleUsers - if App.User.exists(user_id) - user = App.User.find(user_id) - if user.active is true - users.push user - for group in groups - valid_user_ids = [] - for user_id in _.uniq(group.user_ids) - if App.User.exists(user_id) - if App.User.find(user_id).active is true - valid_user_ids.push user_id - group.valid_user_ids = valid_user_ids + @renderOptionsGroups() + @renderOptionsMacros() + renderOptionsGroups: => @batchAssignInner.html $(App.view('ticket_overview/batch_overlay_user_group')( - users: users - groups: groups + @validUsersForTicketSelection() )) + + renderOptionsMacros: => + macros = App.Macro.search(filter: { active: true }, sortBy:'name', order:'DESC') + @batchMacro.html $(App.view('ticket_overview/batch_overlay_macro')( macros: macros )) @@ -695,9 +709,10 @@ class App.TicketOverview extends App.Controller changed: -> false - release: -> + release: => @keyboardOff() super + App.TicketCreateCollection.unbindById(@bindId) keyboardOn: => $(window).off 'keydown.overview_navigation' @@ -911,6 +926,9 @@ class Navbar extends App.Controller @autoFoldTabs() class Table extends App.Controller + @extend App.PopoverProvidable + @registerPopovers 'Organization', 'User' + events: 'click [data-type=settings]': 'settings' 'click [data-type=viewmode]': 'viewmode' @@ -962,6 +980,7 @@ class Table extends App.Controller overviewAttributes: @overview.view.s objects: ticketListShow groupBy: @overview.group_by + groupDirection: @overview.group_direction orderBy: @overview.order.by orderDirection: @overview.order.direction ) @@ -1078,10 +1097,11 @@ class Table extends App.Controller id: object.organization_id value callbackCheckbox = (id, checked, e) => - if @$('table').find('input[name="bulk"]:checked').length == 0 - @bulkForm.hide() - else + if @shouldShowBulkForm() + @bulkForm.render() @bulkForm.show() + else + @bulkForm.hide() if @lastChecked && e.shiftKey # check items in a row @@ -1127,6 +1147,7 @@ class Table extends App.Controller objects: ticketListShow checkbox: checkbox groupBy: @overview.group_by + groupDirection: @overview.group_direction orderBy: @overview.order.by orderDirection: @overview.order.direction class: 'table--light' @@ -1156,11 +1177,7 @@ class Table extends App.Controller 'click': callbackCheckbox ) - # start user popups - @userPopups() - - # start organization popups - @organizationPopups() + @renderPopovers() @bulkForm = new BulkForm( holder: @el @@ -1174,11 +1191,11 @@ class Table extends App.Controller # show/hide bulk action @$('.table-overview').delegate('input[name="bulk"], input[name="bulk_all"]', 'change', (e) => - if @$('.table-overview').find('input[name="bulk"]:checked').length == 0 + if @shouldShowBulkForm() + @bulkForm.show() + else @bulkForm.hide() @bulkForm.reset() - else - @bulkForm.show() ) # deselect bulk_all if one item is uncheck observ @@ -1198,6 +1215,17 @@ class Table extends App.Controller bulkAll.prop('indeterminate', true) ) + shouldShowBulkForm: => + items = @$('table').find('input[name="bulk"]:checked') + return false if items.length == 0 + + ticket_ids = _.map(items, (el) -> $(el).val() ) + ticket_group_ids = _.map(App.Ticket.findAll(ticket_ids), (ticket) -> ticket.group_id) + ticket_group_ids = _.uniq(ticket_group_ids) + user_permissions = App.Session.get('group_ids') + group_permissions = ticket_group_ids.map (id) -> user_permissions[id] + _.every(group_permissions, (list) -> 'full' in list || 'change' in list) + viewmode: (e) => e.preventDefault() @view_mode = $(e.target).data('mode') @@ -1224,6 +1252,8 @@ class BulkForm extends App.Controller 'click .js-confirm': 'confirm' 'click .js-cancel': 'reset' + @include ValidUsersForTicketSelectionMethods + constructor: -> super @@ -1257,6 +1287,12 @@ class BulkForm extends App.Controller handlers = @Config.get('TicketZoomFormHandler') + for attribute in @configure_attributes_ticket + continue if attribute.name != 'owner_id' + {users, groups} = @validUsersForTicketSelection() + options = _.map(users, (user) -> {value: user.id, name: user.displayName()} ) + attribute.possible_groups_owners = options + new App.ControllerForm( el: @$('#form-ticket-bulk') model: @@ -1522,7 +1558,7 @@ class App.OverviewSettings extends App.ControllerModal }, { name: 'order::direction' - display: 'Direction' + display: 'Order by Direction' tag: 'select' default: @overview.order.direction null: false @@ -1540,7 +1576,18 @@ class App.OverviewSettings extends App.ControllerModal nulloption: true translate: true options: App.Overview.groupByAttributes() - }) + }, + { + name: 'group_direction' + display: 'Group by Direction' + tag: 'select' + default: @overview.group_direction + null: false + translate: true + options: + ASC: 'up' + DESC: 'down' + },) controller = new App.ControllerForm( model: { configure_attributes: @configure_attributes_article } @@ -1565,6 +1612,10 @@ class App.OverviewSettings extends App.ControllerModal @overview.order.direction = params.order.direction @reload_needed = true + if @overview.group_direction isnt params.group_direction + @overview.group_direction = params.group_direction + @reload_needed = true + for key, value of params.view @overview.view[key] = value diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.coffee index ccd5c1e0a5d8..28f86a5be9f5 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.coffee @@ -1,4 +1,6 @@ class App.TicketZoom extends App.Controller + @include App.TicketNavigable + elements: '.main': 'main' '.ticketZoom': 'ticketZoom' @@ -291,6 +293,7 @@ class App.TicketZoom extends App.Controller hide: => @activeState = false + $('body > .modal').modal('hide') @positionPageHeaderStop() @autosaveStop() @shortcutNavigationstop() @@ -383,6 +386,7 @@ class App.TicketZoom extends App.Controller # if page header is not possible to use - mainScrollHeigth to low - hide page header if not mainScrollHeigth > mainHeigth + headerHeight @scrollPageHeader.css('transform', "translateY(#{-headerHeight}px)") + return if scroll > headerHeight scroll = headerHeight @@ -439,17 +443,19 @@ class App.TicketZoom extends App.Controller #if @shown # @attributeBar.start() - @form_id = App.ControllerForm.formId() + @form_id = @taskGet('article').form_id || App.ControllerForm.formId() @articleNew = new App.TicketZoomArticleNew( - ticket: @ticket - ticket_id: @ticket_id - el: elLocal.find('.article-new') - formMeta: @formMeta - form_id: @form_id - defaults: @taskGet('article') - taskKey: @taskKey - ui: @ + ticket: @ticket + ticket_id: @ticket_id + el: elLocal.find('.article-new') + formMeta: @formMeta + form_id: @form_id + defaults: @taskGet('article') + taskKey: @taskKey + ui: @ + callbackFileUploadStart: @submitDisable + callbackFileUploadStop: @submitEnable ) @highligher = new App.TicketZoomHighlighter( @@ -605,6 +611,7 @@ class App.TicketZoom extends App.Controller body: '' internal: internal in_reply_to: '' + subtype: '' if @permissionCheck('ticket.customer') currentStore.article.internal = '' @@ -633,6 +640,11 @@ class App.TicketZoom extends App.Controller # and the default is was not set before return if @isDefaultFollowUpStateSet + # and only if ticket is not in "new" state + if @ticket && @ticket.state_id + state = App.TicketState.findByAttribute('id', @ticket.state_id) + return if state && state.default_create is true + # prevent multiple changes for the default follow up state @isDefaultFollowUpStateSet = true @@ -660,7 +672,6 @@ class App.TicketZoom extends App.Controller else delete currentParams.article.attachments - # remove not needed attributes delete currentParams.article.form_id if @permissionCheck('ticket.customer') @@ -730,16 +741,28 @@ class App.TicketZoom extends App.Controller resetButton.removeClass('hide') + submitDisable: (e) => + if e + @formDisable(e) + return + @formDisable(@$('.js-submitDropdown')) + + submitEnable: (e) => + if e + @formEnable(e) + return + @formEnable(@$('.js-submitDropdown')) + submit: (e, macro = {}) => e.stopPropagation() e.preventDefault() # disable form - @formDisable(e) + @submitDisable(e) # validate new article if !@articleNew.validate() - @formEnable(e) + @submitEnable(e) return ticketParams = @formParam(@$('.edit')) @@ -757,19 +780,20 @@ class App.TicketZoom extends App.Controller for key, value of ticketParams ticket[key] = value - App.Ticket.macro( - macro: macro - ticket: ticket - callback: - tagAdd: (tag) => - return if !@sidebarWidget - return if !@sidebarWidget.reload - @sidebarWidget.reload(tagAdd: tag, source: 'macro') - tagRemove: (tag) => - return if !@sidebarWidget - return if !@sidebarWidget.reload - @sidebarWidget.reload(tagRemove: tag) - ) + if macro.perform + App.Ticket.macro( + macro: macro.perform + ticket: ticket + callback: + tagAdd: (tag) => + return if !@sidebarWidget + return if !@sidebarWidget.reload + @sidebarWidget.reload(tagAdd: tag, source: 'macro') + tagRemove: (tag) => + return if !@sidebarWidget + return if !@sidebarWidget.reload + @sidebarWidget.reload(tagRemove: tag) + ) # set defaults if !@permissionCheck('ticket.customer') @@ -794,7 +818,7 @@ class App.TicketZoom extends App.Controller errors: errors screen: 'edit' ) - @formEnable(e) + @submitEnable(e) @autosaveStart() return @@ -810,47 +834,53 @@ class App.TicketZoom extends App.Controller errors: errors screen: 'edit' ) - @formEnable(e) + @submitEnable(e) @autosaveStart() return ticket.article = article + # add sidebar params + if @sidebarWidget && @sidebarWidget.postParams + @sidebarWidget.postParams(ticket: ticket) + if !ticket.article - @submitPost(e, ticket) + @submitPost(e, ticket, macro) return # verify if time accounting is enabled if @Config.get('time_accounting') isnt true - @submitPost(e, ticket) + @submitPost(e, ticket, macro) return # verify if time accounting is active for ticket time_accounting_selector = @Config.get('time_accounting_selector') if !App.Ticket.selector(ticket, time_accounting_selector['condition']) - @submitPost(e, ticket) + @submitPost(e, ticket, macro) return # time tracking if @permissionCheck('ticket.customer') - @submitPost(e, ticket) + @submitPost(e, ticket, macro) return new App.TicketZoomTimeAccounting( container: @el.closest('.content') ticket: ticket cancelCallback: => - @formEnable(e) + @submitEnable(e) submitCallback: (params) => if params.time_unit ticket.article.time_unit = params.time_unit - @submitPost(e, ticket) + @submitPost(e, ticket, macro) ) - submitPost: (e, ticket) => - + submitPost: (e, ticket, macro) => taskAction = @$('.js-secondaryActionButtonLabel').data('type') + if macro && macro.ux_flow_next_up + taskAction = macro.ux_flow_next_up + # submit changes @ajax( id: "ticket_update_#{ticket.id}" @@ -872,59 +902,33 @@ class App.TicketZoom extends App.Controller if @sidebarWidget @sidebarWidget.commit() - if taskAction is 'closeNextInOverview' - if @overview_id - current_position = 0 - overview = App.Overview.find(@overview_id) - list = App.OverviewListCollection.get(overview.link) - for ticket in list.tickets - current_position += 1 - if ticket.id is @ticket_id - next = list.tickets[current_position] - if next - # close task - App.TaskManager.remove(@taskKey) - - # open task via task manager to get overview information - App.TaskManager.execute( - key: 'Ticket-' + next.id - controller: 'TicketZoom' - params: - ticket_id: next.id - overview_id: @overview_id - show: true - ) - @navigate "ticket/zoom/#{next.id}" - return - - # fallback, close task - taskAction = 'closeTab' - - if taskAction is 'closeTab' - App.TaskManager.remove(@taskKey) - nextTaskUrl = App.TaskManager.nextTaskUrl() - if nextTaskUrl - @navigate nextTaskUrl - return - - @navigate '#' + if taskAction is 'closeNextInOverview' || taskAction is 'next_from_overview' + App.Event.trigger('overview:fetch') + @taskOpenNextTicketInOverview() + return + + if taskAction is 'closeTab' || taskAction is 'next_task' + App.Event.trigger('overview:fetch') + @taskCloseTicket(true) return @autosaveStart() @muteTask() - @formEnable(e) - App.Event.trigger('overview:fetch') + @submitEnable(e) error: (settings, details) => + error = undefined + if settings && settings.responseJSON && settings.responseJSON.error + error = settings.responseJSON.error App.Event.trigger 'notify', { type: 'error' - msg: App.i18n.translateContent(details.error_human || details.error || settings.responseJSON.error || 'Unable to update!') + msg: App.i18n.translateContent(details.error_human || details.error || error || 'Unable to update!') timeout: 2000 } @autosaveStart() @muteTask() @fetch() - @formEnable(e) + @submitEnable(e) ) bookmark: (e) -> @@ -960,6 +964,10 @@ class App.TicketZoom extends App.Controller taskGet: (area) => return {} if !App.TaskManager.get(@taskKey) @localTaskData = App.TaskManager.get(@taskKey).state || {} + + if _.isObject(@localTaskData.article) && _.isArray(App.TaskManager.get(@taskKey).attachments) + @localTaskData.article['attachments'] = App.TaskManager.get(@taskKey).attachments + if area if !@localTaskData[area] @localTaskData[area] = {} @@ -974,10 +982,15 @@ class App.TicketZoom extends App.Controller taskUpdateAll: (data) => @localTaskData = data + @localTaskData.article['form_id'] = @form_id App.TaskManager.update(@taskKey, { 'state': @localTaskData }) # reset task state taskReset: => + @form_id = App.ControllerForm.formId() + @articleNew.form_id = @form_id + @articleNew.render() + @localTaskData = ticket: {} article: {} diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/email_reply.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/email_reply.coffee index 204dbd7d41b1..700fa08ce42d 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/email_reply.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/email_reply.coffee @@ -30,11 +30,12 @@ class EmailReply extends App.Controller # remove system addresses localAddresses = App.EmailAddress.all() - forgeinRecipients = [] + foreignRecipients = [] recipientUsed = {} for recipient in recipients if !_.isEmpty(recipient.address) localRecipientAddress = recipient.address.toString().toLowerCase() + if !recipientUsed[localRecipientAddress] recipientUsed[localRecipientAddress] = true localAddress = false @@ -43,10 +44,10 @@ class EmailReply extends App.Controller recipientUsed[localRecipientAddress] = true localAddress = true if !localAddress - forgeinRecipients.push recipient + foreignRecipients.push recipient # check if reply all is neede - if forgeinRecipients.length > 1 + if foreignRecipients.length > 1 actions.push { name: 'reply all' type: 'emailReplyAll' @@ -148,7 +149,11 @@ class EmailReply extends App.Controller selected = App.Utils.text2html(selected) if selected - selected = "


#{selected}

" + date = @date_format(article.created_at) + name = article.updated_by.displayName() + email = article.updated_by.email + quote_header = App.i18n.translateInline('On %s, %s wrote:', date, name) + selected = "


#{quote_header}

#{selected}

" # add selected text to body body = selected + body @@ -157,6 +162,8 @@ class EmailReply extends App.Controller type = App.TicketArticleType.findByAttribute(name:'email') + articleNew.subtype = 'reply' + App.Event.trigger('ui::ticket::setArticleType', { ticket: ticket type: type @@ -166,6 +173,15 @@ class EmailReply extends App.Controller true + @date_format: (date_string) -> + options = { + weekday: 'long' + month: 'long' + day: 'numeric' + year: 'numeric' + } + new Date(date_string).toLocaleTimeString('en-US', options) + @emailForward: (ticket, article, ui) -> ui.scrollToCompose() @@ -187,12 +203,14 @@ class EmailReply extends App.Controller if ui.Config.get('ui_ticket_zoom_article_email_subject') if _.isEmpty(article.subject) - articleNew.subject = "FW: #{ticket.title}" + articleNew.subject = ticket.title else - articleNew.subject = "FW: #{article.subject}" + articleNew.subject = article.subject type = App.TicketArticleType.findByAttribute(name:'email') + articleNew.subtype = 'forward' + App.Event.trigger('ui::ticket::setArticleType', { ticket: ticket type: type @@ -278,6 +296,7 @@ class EmailReply extends App.Controller App.Utils.htmlStrip(signature) if signaturePosition is 'top' body.prepend(signature) + body.prepend('
') else body.append(signature) ui.$('[data-name=body]').replaceWith(body) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee index a8138a5d3fb1..d24dc366df90 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee @@ -47,6 +47,10 @@ class App.TicketZoomArticleNew extends App.Controller if @defaults.body or @isIE10() @openTextarea(null, true) + if _.isArray(@defaults.attachments) + for attachment in @defaults.attachments + @renderAttachment(attachment) + # set article type and expand text area @bind('ui::ticket::setArticleType', (data) => return if data.ticket.id.toString() isnt @ticket_id.toString() @@ -175,7 +179,7 @@ class App.TicketZoomArticleNew extends App.Controller key: 'File' data: form_id: @form_id - maxSimultaneousUploads: 1, + maxSimultaneousUploads: 1 onFileAdded: (file) => file.on( @@ -185,11 +189,17 @@ class App.TicketZoomArticleNew extends App.Controller @attachmentUpload.removeClass('hide') @cancelContainer.removeClass('hide') + if @callbackFileUploadStart + @callbackFileUploadStart() + onAborted: => @attachmentPlaceholder.removeClass('hide') @attachmentUpload.addClass('hide') @$('.article-attachment input').val('') + if @callbackFileUploadStop + @callbackFileUploadStop() + # Called after received response from the server onCompleted: (response) => @@ -206,6 +216,9 @@ class App.TicketZoomArticleNew extends App.Controller @renderAttachment(response.data) @$('.article-attachment input').val('') + if @callbackFileUploadStop + @callbackFileUploadStop() + # Called during upload progress, first parameter # is decimal value from 0 to 100. onProgress: (progress, fileSize, uploadedBytes) => diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee index e281199726df..7c1f39ca3cb4 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee @@ -148,13 +148,13 @@ class ArticleViewItem extends App.ObserverController body.splice(article.preferences.signature_detection, 0, signatureDetected) body = body.join('
') else - body = App.Utils.signatureIdentify(body) + body = App.Utils.signatureIdentifyByHtml(body) article['html'] = body else # client signature detection bodyHtml = App.Utils.text2html(article.body) - article['html'] = App.Utils.signatureIdentify(bodyHtml) + article['html'] = App.Utils.signatureIdentifyByPlaintext(bodyHtml) # if no signature detected or within frist 25 lines, check if signature got detected in backend if article['html'] is bodyHtml || (article.preferences && article.preferences.signature_detection < 25) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/attribute_bar.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/attribute_bar.coffee index c147c47bf2a7..79e9a79a3911 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/attribute_bar.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/attribute_bar.coffee @@ -1,13 +1,11 @@ class App.TicketZoomAttributeBar extends App.Controller - @include App.TicketNavigable - elements: '.js-submitDropdown': 'buttonDropdown' '.js-reset': 'resetButton' events: 'mousedown .js-openDropdownMacro': 'toggleMacroMenu' - 'click .js-openDropdownMacro': 'stopPropagation' + 'click .js-openDropdownMacro': 'preventDefaultAndstopPropagation' 'mouseup .js-dropdownActionMacro': 'performTicketMacro' 'mouseenter .js-dropdownActionMacro': 'onActionMacroMouseEnter' 'mouseleave .js-dropdownActionMacro': 'onActionMacroMouseLeave' @@ -72,7 +70,10 @@ class App.TicketZoomAttributeBar extends App.Controller @render() toggleMacroMenu: => - if @buttonDropdown.hasClass('is-open') then @closeMacroMenu() else @openMacroMenu() + if @buttonDropdown.hasClass('is-open') + @closeMacroMenu() + return + @openMacroMenu() openMacroMenu: => @buttonDropdown.addClass 'is-open' @@ -86,19 +87,8 @@ class App.TicketZoomAttributeBar extends App.Controller macroId = $(e.currentTarget).data('id') macro = App.Macro.find(macroId) - @callback(e, macro.perform) + @callback(e, macro) @closeMacroMenu() - @replaceTabWith(macro.ux_flow_next_up) - - replaceTabWith: (dest) => - switch dest - when 'none' - return - when 'next_task' - @closeTab() - when 'next_from_overview' - @closeTab() - @openNextTicketInOverview() onActionMacroMouseEnter: (e) => @$(e.currentTarget).addClass('is-active') diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/overview_navigator.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/overview_navigator.coffee index 094bb62b357e..18615eb5b6e2 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/overview_navigator.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/overview_navigator.coffee @@ -70,4 +70,4 @@ class App.TicketZoomOverviewNavigator extends App.Controller else return - @openTicket(id, url) + @taskOpenTicket(id, url) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/owner_handler_dependencies.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/owner_handler_dependencies.coffee new file mode 100644 index 000000000000..74a853876268 --- /dev/null +++ b/app/assets/javascripts/app/controllers/ticket_zoom/owner_handler_dependencies.coffee @@ -0,0 +1,26 @@ +class OwnerFormHandlerDependencies + + # central method, is getting called on every ticket form change + @run: (params, attribute, attributes, classname, form, ui) -> + return if 'group_id' not of params + return if 'owner_id' not of params + + owner_attribute = _.find(attributes, (o) -> o.name == 'owner_id') + return if !owner_attribute + return if 'possible_groups_owners' not of owner_attribute + + # fetch contents using User relation if a Group has been selected, otherwise render possible_groups_owners + if params.group_id + owner_attribute.relation = 'User' + delete owner_attribute['options'] + else + owner_attribute.options = owner_attribute.possible_groups_owners + delete owner_attribute['relation'] + + # replace new option list + owner_attribute.default = params[owner_attribute.name] + owner_attribute.newValue = params[owner_attribute.name] + newElement = ui.formGenItem(owner_attribute, classname, form) + form.find('select[name="owner_id"]').closest('.form-group').replaceWith(newElement) + +App.Config.set('150-ticketFormChanges', OwnerFormHandlerDependencies, 'TicketZoomFormHandler') diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar.coffee index 78491dbdb5e9..4ebb1ab8dc1b 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar.coffee @@ -14,6 +14,11 @@ class App.TicketZoomSidebar extends App.ObserverController if backend && backend.commit backend.commit(args) + postParams: (args) => + for key, backend of @sidebarBackends + if backend && backend.postParams + backend.postParams(args) + render: (ticket) => @sidebarBackends ||= {} @sidebarItems = [] diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee index cdeb42e46125..9f3da418c397 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee @@ -92,6 +92,9 @@ class SidebarIdoit extends App.Controller showError: (message) => @html App.i18n.translateInline(message) + reload: => + @showObjectsContent() + delete: (objectId) => localObjects = [] for localObjectId in @objectIds @@ -102,13 +105,14 @@ class SidebarIdoit extends App.Controller @updateTicket(@ticket.id, @objectIds) @showObjectsContent() - commit: (args) => - return if @ticket && @ticket.id + postParams: (args) => + return if !args.ticket + return if args.ticket.created_at return if !@objectIds return if _.isEmpty(@objectIds) - return if !args - return if !args.ticket_id - @updateTicket(args.ticket_id, @objectIds) + args.ticket.preferences ||= {} + args.ticket.preferences.idoit ||= {} + args.ticket.preferences.idoit.object_ids = @objectIds updateTicket: (ticket_id, objectIds, callback) => App.Ajax.request( diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/time_accounting.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/time_accounting.coffee index 8c4c01546ae5..49e3bf379e4d 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/time_accounting.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/time_accounting.coffee @@ -29,6 +29,10 @@ class App.TicketZoomTimeAccounting extends App.ControllerModal return if !@cancelCallback @cancelCallback() + onClose: -> + return if !@cancelCallback + @cancelCallback() + onSubmit: => @$('[name="time_unit"]').removeClass('has-error') params = @formParams() diff --git a/app/assets/javascripts/app/controllers/translation.coffee b/app/assets/javascripts/app/controllers/translation.coffee index a1a70da11cf0..9745c597048c 100644 --- a/app/assets/javascripts/app/controllers/translation.coffee +++ b/app/assets/javascripts/app/controllers/translation.coffee @@ -79,6 +79,14 @@ class Index extends App.ControllerSubContent @toggleAction() ) + show: => + # see https://github.com/zammad/zammad/issues/2056 + @untranslatedAtLastRender ||= $.extend({}, App.i18n.getNotTranslated(@locale)) + return if _.isEqual(@untranslatedAtLastRender, App.i18n.getNotTranslated(@locale)) + + @untranslatedAtLastRender = $.extend({}, App.i18n.getNotTranslated(@locale)) + App.Event.trigger('ui:rerender') + hide: => @rerender() diff --git a/app/assets/javascripts/app/controllers/user_profile.coffee b/app/assets/javascripts/app/controllers/user_profile.coffee index 3a2614c72eb8..e22fa9618ca9 100644 --- a/app/assets/javascripts/app/controllers/user_profile.coffee +++ b/app/assets/javascripts/app/controllers/user_profile.coffee @@ -52,6 +52,13 @@ class App.UserProfile extends App.Controller el: elLocal.find('.js-organization') ) + if user.organization_ids + for id in user.organization_ids + a = new Organization( + object_id: id + el: elLocal.find('.js-organization-' + id) + ) + new Object( el: elLocal.find('.js-object-container') object_id: user.id diff --git a/app/assets/javascripts/app/controllers/users.coffee b/app/assets/javascripts/app/controllers/users.coffee index 32a4d4db9366..2aca442d067e 100644 --- a/app/assets/javascripts/app/controllers/users.coffee +++ b/app/assets/javascripts/app/controllers/users.coffee @@ -27,23 +27,20 @@ class Index extends App.ControllerSubContent e.preventDefault() $(e.target).toggleClass('active') query = @searchInput.val().trim() - if query - @delay( @search, 220, 'search' ) - return - @recent() + @query = query + @delay(@search, 220, 'search') ) # start search @searchInput.bind( 'keyup', (e) => query = @searchInput.val().trim() - return if !query return if query is @query @query = query - @delay( @search, 220, 'search' ) + @delay(@search, 220, 'search') ) # show last 20 users - @recent() + @search() renderResult: (user_ids = []) -> @stopLoading() @@ -143,40 +140,18 @@ class Index extends App.ControllerSubContent App.Ajax.request( id: 'search' type: 'GET' - url: "#{@apiPath}/users/search" + url: "#{@apiPath}/users/search?sort_by=created_at" data: - query: @query - limit: 140 + query: @query || '*' + limit: 50 role_ids: role_ids full: true processData: true, - success: (data, status, xhr) => - App.Collection.loadAssets(data.assets) - @renderResult(data.user_ids) - done: => - @stopLoading() - ) - - recent: => - role_ids = [] - @$('.tab.active').each( (i,d) -> - role_ids.push $(d).data('id') - ) - @startLoading(@$('.table-overview')) - App.Ajax.request( - id: 'search' - type: 'GET' - url: "#{@apiPath}/users/recent" - data: - limit: 50 - role_ids: role_ids - full: true - processData: true success: (data, status, xhr) => App.Collection.loadAssets(data.assets) @renderResult(data.user_ids) @stopLoading() - error: => + done: => @stopLoading() ) @@ -191,7 +166,7 @@ class Index extends App.ControllerSubContent navupdate: '#users' genericObject: 'User' container: @el.closest('.content') - callback: @recent + callback: @search ) import: (e) -> diff --git a/app/assets/javascripts/app/controllers/widget/avatar.coffee b/app/assets/javascripts/app/controllers/widget/avatar.coffee index e6bc84d35543..9dae76b9a2f9 100644 --- a/app/assets/javascripts/app/controllers/widget/avatar.coffee +++ b/app/assets/javascripts/app/controllers/widget/avatar.coffee @@ -1,4 +1,7 @@ class App.WidgetAvatar extends App.ObserverController + @extend App.PopoverProvidable + @registerPopovers 'User' + model: 'User' observe: login: true @@ -17,4 +20,4 @@ class App.WidgetAvatar extends App.ObserverController render: (user) => @html(user.avatar(@size, @position, @cssClass, false, false, @type)) - @userPopups(@position) + @renderPopovers() diff --git a/app/assets/javascripts/app/controllers/widget/link.coffee b/app/assets/javascripts/app/controllers/widget/link.coffee index 20dab6a91dd2..7af8f6d6dc0a 100644 --- a/app/assets/javascripts/app/controllers/widget/link.coffee +++ b/app/assets/javascripts/app/controllers/widget/link.coffee @@ -1,4 +1,10 @@ class App.WidgetLink extends App.Controller + @extend App.PopoverProvidable + @registerPopovers 'Ticket' + + @popoversDefaults: + position: 'left' + events: 'click .js-add': 'add' 'click .js-delete': 'delete' @@ -54,7 +60,8 @@ class App.WidgetLink extends App.Controller @html App.view('link/info')( links: list ) - @ticketPopups('left') + + @renderPopovers() delete: (e) => e.preventDefault() diff --git a/app/assets/javascripts/app/controllers/widget/organization.coffee b/app/assets/javascripts/app/controllers/widget/organization.coffee index 64e63a44bc4c..77ba6b3ad4e2 100644 --- a/app/assets/javascripts/app/controllers/widget/organization.coffee +++ b/app/assets/javascripts/app/controllers/widget/organization.coffee @@ -1,4 +1,7 @@ class App.WidgetOrganization extends App.Controller + @extend App.PopoverProvidable + @registerPopovers 'User' + events: 'focusout [contenteditable]': 'update' @@ -26,10 +29,10 @@ class App.WidgetOrganization extends App.Controller name = nameNew # add to show if value exists - if ( organization[name] || attributeConfig.tag is 'richtext' ) && attributeConfig.shown + if ( organization[name]? || attributeConfig.tag is 'richtext' ) && attributeConfig.shown # do not show firstname and lastname / already show via diplayName() - if name isnt 'name' + if name isnt 'name' && organization[name] isnt '' organizationData.push attributeConfig # insert userData @@ -44,16 +47,7 @@ class App.WidgetOrganization extends App.Controller maxlength: 250 ) - # enable user popups - @userPopups() - - ### - @userTicketPopups( - selector: '.user-tickets' - user_id: user.id - position: 'right' - ) - ### + @renderPopovers() update: (e) => name = $(e.target).attr('data-name') diff --git a/app/assets/javascripts/app/controllers/widget/ticket_list.coffee b/app/assets/javascripts/app/controllers/widget/ticket_list.coffee index 9ab9ef4c141d..d4a99405952c 100644 --- a/app/assets/javascripts/app/controllers/widget/ticket_list.coffee +++ b/app/assets/javascripts/app/controllers/widget/ticket_list.coffee @@ -1,4 +1,7 @@ class App.TicketList extends App.Controller + @extend App.PopoverProvidable + @registerPopovers 'Organization', 'User' + constructor: -> super @@ -85,8 +88,4 @@ class App.TicketList extends App.Controller radio: @radio ) - # start user popups - @userPopups() - - # start organization popups - @organizationPopups() + @renderPopovers() diff --git a/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee b/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee index 67d8b4b5b6bf..44c1d27267c0 100644 --- a/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee +++ b/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee @@ -138,6 +138,9 @@ class App.TicketStats extends App.Controller ) class App.TicketStatsList extends App.Controller + @extend App.PopoverProvidable + @registerPopovers 'Ticket' + events: 'click .js-showAll': 'showAll' @@ -166,7 +169,7 @@ class App.TicketStatsList extends App.Controller limit: @limit ) - @ticketPopups() + @renderPopovers() showAll: (e) => e.preventDefault() diff --git a/app/assets/javascripts/app/controllers/widget/user.coffee b/app/assets/javascripts/app/controllers/widget/user.coffee index d7836e23af94..07631843ca98 100644 --- a/app/assets/javascripts/app/controllers/widget/user.coffee +++ b/app/assets/javascripts/app/controllers/widget/user.coffee @@ -1,4 +1,7 @@ class App.WidgetUser extends App.Controller + @extend App.PopoverProvidable + @registerPopovers 'UserTicket' + events: 'focusout [contenteditable]': 'update' @@ -28,10 +31,10 @@ class App.WidgetUser extends App.Controller name = nameNew # add to show if value exists - if ( user[name] || attributeConfig.tag is 'richtext' ) && attributeConfig.shown + if ( user[name]? || attributeConfig.tag is 'richtext' ) && attributeConfig.shown # do not show firstname and lastname / already show via displayName() - if name isnt 'firstname' && name isnt 'lastname' && name isnt 'organization' + if name isnt 'firstname' && name isnt 'lastname' && name isnt 'organization' && user[name] isnt '' userData.push attributeConfig if user.preferences @@ -76,10 +79,9 @@ class App.WidgetUser extends App.Controller maxlength: 250 ) - @userTicketPopups( - selector: '.user-tickets' + @renderPopovers( + selector: '.user-tickets', user_id: user.id - position: 'right' ) update: (e) => diff --git a/app/assets/javascripts/app/index.coffee b/app/assets/javascripts/app/index.coffee index 4c2852680f8e..64e60859c222 100644 --- a/app/assets/javascripts/app/index.coffee +++ b/app/assets/javascripts/app/index.coffee @@ -85,6 +85,10 @@ class App extends Spine.Controller S: (key) -> App.Session.get(key) + # define view helper for rendering partial views + V: (name, params) -> + App.view(name)(params) + # define address line helper AddressLine: (line) -> return '' if !line diff --git a/app/assets/javascripts/app/lib/app_post/i18n.coffee b/app/assets/javascripts/app/lib/app_post/i18n.coffee index dbfbb72c1d03..b8c385409b26 100644 --- a/app/assets/javascripts/app/lib/app_post/i18n.coffee +++ b/app/assets/javascripts/app/lib/app_post/i18n.coffee @@ -5,6 +5,11 @@ class App.i18n @init: (args) -> _instance ?= new _i18nSingleton(args) + @translateDeep: (input, args...) -> + if _instance == undefined + _instance ?= new _i18nSingleton() + _instance.translateDeep(input, args) + @translateContent: (string, args...) -> if _instance == undefined _instance ?= new _i18nSingleton() @@ -203,6 +208,19 @@ class _i18nSingleton extends Spine.Module return string if !string @translate(string, args, true) + translateDeep: (input, args) => + if _.isArray(input) + _.map input, (item) => + @translateDeep(item, args) + else if _.isObject(input) + _.reduce _.keys(input), (memo, item) => + memo[item] = @translateDeep(input[item]) + memo + , {} + else + @translateInline(input, args) + + translateContent: (string, args) => return string if !string diff --git a/app/assets/javascripts/app/lib/app_post/popover_provider/_popover_provider.coffee b/app/assets/javascripts/app/lib/app_post/popover_provider/_popover_provider.coffee new file mode 100644 index 000000000000..75def93aee02 --- /dev/null +++ b/app/assets/javascripts/app/lib/app_post/popover_provider/_popover_provider.coffee @@ -0,0 +1,77 @@ +class App.PopoverProvider + @selectorCssClassPrefix = null # needs to be overrided + @templateName = null # needs to be overrided + @permission = 'ticket.agent' + + @providers = {} + + @providersConfigKey = 'PopoverProviders' + + @registerProvider: (key, klass) -> + @providers[key] = klass + App.Config.set(key, klass, @providersConfigKey) + + @defaults = + position: 'right' + parentController: null + popovers = null + + constructor: (params) -> + if params.parentController is null + throw 'Parent controller needs to be set' + + @params = _.extend {}, @constructor.defaults, params + + build: (buildParams) -> + return if !@checkPermissions() + @clear(@popovers) + @bind() + @popovers = @buildPopovers() + + checkPermissions: -> + @params.parentController.permissionCheck(@constructor.permission) + + cssClass: -> + "#{@constructor.selectorCssClassPrefix}-popover" + + bind: -> + + buildPopovers: (supplementaryData = {}) -> + context = @ + + selector = supplementaryData.selector || ".#{@cssClass()}" + + @params.parentController.el.find(selector).popover( + trigger: 'hover' + container: 'body' + html: true + animation: false + delay: 100 + placement: "auto #{@params.position}" + title: -> + context.buildTitleFor(@, supplementaryData) + content: -> + context.buildContentFor(@, supplementaryData) + ) + + clear: -> + return if !@popovers + @popovers.popover('destroy') + + buildTitleFor: (elem) -> + 'title' + + buildContentFor: (elem) -> + 'content' + + buildHtmlContent: (params) -> + html = $(App.view("popover/#{@constructor.templateName}")(params)) + + html.find('.humanTimeFromNow').each => + @params.parentController.frontendTimeUpdateItem($(@)) + + html + + displayTitleUsing: (object) -> + throw 'please override' + diff --git a/app/assets/javascripts/app/lib/app_post/popover_provider/_single_object_popover_provider.coffee b/app/assets/javascripts/app/lib/app_post/popover_provider/_single_object_popover_provider.coffee new file mode 100644 index 000000000000..70caa45b1811 --- /dev/null +++ b/app/assets/javascripts/app/lib/app_post/popover_provider/_single_object_popover_provider.coffee @@ -0,0 +1,45 @@ +class App.SingleObjectPopoverProvider extends App.PopoverProvider + @klass = null # needs to be overrided + @ignoredAttributes = [] + @includeData = true + @templateName = 'single_object_generic' + + fullCssSelector: -> + "div.#{@cssClass()}, span.#{@cssClass()}" + + bind: -> + @params.parentController.$(@fullCssSelector()).bind('click', (e) => + id = @objectIdFor(e.target) + return if !id + object = @constructor.klass.find(id) + @params.parentController.navigate object.uiUrl() + ) + + objectIdFor: (elem) -> + $(elem).data('id') + + buildTitleFor: (elem) -> + object = @constructor.klass.find(@objectIdFor(elem)) + App.Utils.htmlEscape(@displayTitleUsing(object)) + + buildContentFor: (elem) -> + id = @objectIdFor(elem) + object = @constructor.klass.fullLocal(id) + + # get display data + data = _.values(@constructor.klass.attributesGet('view')) + .filter (attr) -> + # check if value for _id exists + name = attr.name + nameNew = name.substr(0, name.length - 3) + if nameNew of object + name = nameNew + + # add to show if value exists + # do not show ignroed attributes + object[name] && attr.shown && !_.include(@constructor.ignoredAttributes, name) + + @buildHtmlContent( + object: object + attributes: data + ) diff --git a/app/assets/javascripts/app/lib/app_post/popover_provider/organization_popover_provider.coffee b/app/assets/javascripts/app/lib/app_post/popover_provider/organization_popover_provider.coffee new file mode 100644 index 000000000000..7e275de1f9d2 --- /dev/null +++ b/app/assets/javascripts/app/lib/app_post/popover_provider/organization_popover_provider.coffee @@ -0,0 +1,10 @@ +class Organization extends App.SingleObjectPopoverProvider + @klass = App.Organization + @selectorCssClassPrefix = 'organization' + @templateName = 'organization' + @ignoredAttributes = ['name'] + + displayTitleUsing: (object) -> + object.name + +App.PopoverProvider.registerProvider('Organization', Organization) diff --git a/app/assets/javascripts/app/lib/app_post/popover_provider/ticket_popover_provider.coffee b/app/assets/javascripts/app/lib/app_post/popover_provider/ticket_popover_provider.coffee new file mode 100644 index 000000000000..50160b4a75d0 --- /dev/null +++ b/app/assets/javascripts/app/lib/app_post/popover_provider/ticket_popover_provider.coffee @@ -0,0 +1,10 @@ +class Ticket extends App.SingleObjectPopoverProvider + @klass = App.Ticket + @selectorCssClassPrefix = 'ticket' + @templateName = 'ticket' + @includeData = false + + displayTitleUsing: (object) -> + object.title + +App.PopoverProvider.registerProvider('Ticket', Ticket) diff --git a/app/assets/javascripts/app/lib/app_post/popover_provider/user_popover_provider.coffee b/app/assets/javascripts/app/lib/app_post/popover_provider/user_popover_provider.coffee new file mode 100644 index 000000000000..7a608c0f3e4a --- /dev/null +++ b/app/assets/javascripts/app/lib/app_post/popover_provider/user_popover_provider.coffee @@ -0,0 +1,13 @@ +class User extends App.SingleObjectPopoverProvider + @klass = App.User + @selectorCssClassPrefix = 'user' + @templateName = 'user' + @ignoredAttributes = ['firstname', 'lastname', 'organization'] + + displayTitleUsing: (object) -> + output = object.displayName() + if object.isOutOfOffice() + output += " (#{object.outOfOfficeText()})" + output + +App.PopoverProvider.registerProvider('User', User) diff --git a/app/assets/javascripts/app/lib/app_post/popover_provider/user_ticket_popover_provider.coffee b/app/assets/javascripts/app/lib/app_post/popover_provider/user_ticket_popover_provider.coffee new file mode 100644 index 000000000000..5cecf064b2f0 --- /dev/null +++ b/app/assets/javascripts/app/lib/app_post/popover_provider/user_ticket_popover_provider.coffee @@ -0,0 +1,37 @@ +class App.UserTicketPopoverProvider extends App.PopoverProvider + @templateName = 'user_ticket_list' + + fetch: (buildParams) -> + @params.parentController.ajax( + type: 'GET' + url: "#{App.Config.get('api_path')}/ticket_customer" + data: + customer_id: buildParams.user_id + processData: true + success: (data, status, xhr) => + App.Collection.loadAssets(data.assets) + + ticketsList = { open: data.ticket_ids_open, closed: data.ticket_ids_closed } + @callback(ticketsList: ticketsList, selector: buildParams.selector) + ) + + build: (buildParams) -> + return if !@checkPermissions() + @fetch(buildParams) + + callback: (supplementaryData) -> + @clear(@popovers) + @popovers = @buildPopovers(supplementaryData) + + buildTitleFor: (elem) -> + $(elem).find('[title="*"]').val() + + buildContentFor: (elem, supplementaryData) -> + type = $(elem).filter('[data-type]').data('type') + ticket_ids = supplementaryData.ticketsList[type] || [] + + tickets = ticket_ids.map (ticketId) -> App.Ticket.fullLocal(ticketId) + + # insert data + @buildHtmlContent(tickets: tickets) + diff --git a/app/assets/javascripts/app/lib/app_post/pretty_date.coffee b/app/assets/javascripts/app/lib/app_post/pretty_date.coffee index fc2711985a2f..d60b1071df83 100644 --- a/app/assets/javascripts/app/lib/app_post/pretty_date.coffee +++ b/app/assets/javascripts/app/lib/app_post/pretty_date.coffee @@ -31,6 +31,14 @@ class App.PrettyDate if type is undefined && window.App && window.App.Config type = window.App.Config.get('pretty_date_format') + + # YYYY-MM-DD HH::MM + if type is 'timestamp' + string = App.i18n.translateTimestamp(time) + if escalation + string = "#{string}" + return string + if type is 'absolute' && (direction is 'past' || direction is 'future') weekdays = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'] weekday = weekdays[created.getDay()] diff --git a/app/assets/javascripts/app/lib/app_post/searchable_select.coffee b/app/assets/javascripts/app/lib/app_post/searchable_select.coffee index 81092895423f..8598fe89a4a0 100644 --- a/app/assets/javascripts/app/lib/app_post/searchable_select.coffee +++ b/app/assets/javascripts/app/lib/app_post/searchable_select.coffee @@ -36,7 +36,6 @@ class App.SearchableSelect extends Spine.Controller render: -> firstSelected = _.find @attribute.options, (option) -> option.selected - if firstSelected @attribute.valueName = firstSelected.name @attribute.value = firstSelected.value @@ -44,7 +43,6 @@ class App.SearchableSelect extends Spine.Controller @attribute.valueName = @attribute.value else if @hasSubmenu @attribute.options @attribute.valueName = @getName @attribute.value, @attribute.options - @html App.view('generic/searchable_select') attribute: @attribute options: @renderAllOptions '', @attribute.options, 0 @@ -140,11 +138,13 @@ class App.SearchableSelect extends Spine.Controller when 39 then @autocompleteOrNavigateIn event # right when 37 then @autocompleteOrNavigateOut event # left when 13 then @onEnter event - when 27 then @onEscape() + when 27 then @onEscape event when 9 then @onTab event onEscape: -> - @toggle() if @isOpen + if @isOpen + event.stopPropagation() # if the input is in a modal, prevent the modal from closing + @toggle() getCurrentOptions: -> @currentMenu.find('.js-option, .js-enter, .js-back') diff --git a/app/assets/javascripts/app/lib/app_post/task_manager.coffee b/app/assets/javascripts/app/lib/app_post/task_manager.coffee index affb98afcad8..6dcd1c987112 100644 --- a/app/assets/javascripts/app/lib/app_post/task_manager.coffee +++ b/app/assets/javascripts/app/lib/app_post/task_manager.coffee @@ -83,7 +83,20 @@ class App.TaskManager return if !_instance _instance.preferencesTrigger(key) + @tasksAutoCleanupDelayTime: (key) -> + return if !_instance + if !key + return _instance.tasksAutoCleanupDelayTime + _instance.tasksAutoCleanupDelayTime = key + + @tasksAutoCleanupTaskMax: (key) -> + return if !_instance + if !key + return _instance.maxTaskCount + _instance.maxTaskCount = key + class _taskManagerSingleton extends App.Controller + @extend App.PopoverProvidable @include App.LogInclude constructor: (params = {}) -> @@ -108,9 +121,11 @@ class _taskManagerSingleton extends App.Controller @tasksToUpdate = {} @tasksPreferences = {} @tasksPreferencesCallbacks = {} + @tasksAutoCleanupDelayTime = 12000 @activeTaskHistory = [] @queue = [] @queueRunning = false + @maxTaskCount = 30 all: -> @@ -380,7 +395,7 @@ class _taskManagerSingleton extends App.Controller if controller.hide && _.isFunction(controller.hide) controller.hide() - @anyPopoversDestroy() + @delayedRemoveAnyPopover() true @@ -599,7 +614,7 @@ class _taskManagerSingleton extends App.Controller tasksAutoCleanupDelay: => delay = => @tasksAutoCleanup() - App.Delay.set(delay, 12000, 'task-autocleanup', undefined, true) + App.Delay.set(delay, @tasksAutoCleanupDelayTime, 'task-autocleanup', undefined, true) tasksAutoCleanup: => @@ -607,13 +622,19 @@ class _taskManagerSingleton extends App.Controller currentTaskCount = => Object.keys(@allTasksByKey).length - maxTaskCount = 30 - if currentTaskCount() > maxTaskCount - for task in App.Taskbar.search(sortBy:'updated_at', order:'ASC') - if currentTaskCount() > maxTaskCount + if currentTaskCount() > @maxTaskCount + if @offlineModus + tasks = @all() + else + tasks = App.Taskbar.search(sortBy:'updated_at', order:'ASC') + for task in tasks + if currentTaskCount() > @maxTaskCount if !task.active - if _.isEmpty(task.state) || (_.isEmpty(task.state.ticket) && _.isEmpty(task.state.article)) - @log 'notice', "More then #{maxTaskCount} tasks open, close oldest untouched task #{task.key}" + worker = App.TaskManager.worker(task.key) + if worker + if worker.changed && worker.changed() + continue + @log 'notice', "More then #{@maxTaskCount} tasks open, close oldest untouched task #{task.key}" @remove(task.key) tasksInitial: => diff --git a/app/assets/javascripts/app/lib/app_post/user_ticket_popover_provider.coffee b/app/assets/javascripts/app/lib/app_post/user_ticket_popover_provider.coffee new file mode 100644 index 000000000000..b5c1f1cd4183 --- /dev/null +++ b/app/assets/javascripts/app/lib/app_post/user_ticket_popover_provider.coffee @@ -0,0 +1,38 @@ +class UserTicket extends App.PopoverProvider + @templateName = 'user_ticket_list' + + fetch: (buildParams) -> + @params.parentController.ajax( + type: 'GET' + url: "#{App.Config.get('api_path')}/ticket_customer" + data: + customer_id: buildParams.user_id + processData: true + success: (data, status, xhr) => + App.Collection.loadAssets(data.assets) + + ticketsList = { open: data.ticket_ids_open, closed: data.ticket_ids_closed } + @callback(ticketsList: ticketsList, selector: buildParams.selector) + ) + + build: (buildParams) -> + return if !@checkPermissions() + @fetch(buildParams) + + callback: (supplementaryData) -> + @clear(@popovers) + @popovers = @buildPopovers(supplementaryData) + + buildTitleFor: (elem) -> + $(elem).find('[title="*"]').val() + + buildContentFor: (elem, supplementaryData) -> + type = $(elem).filter('[data-type]').data('type') + ticket_ids = supplementaryData.ticketsList[type] || [] + + tickets = ticket_ids.map (ticketId) -> App.Ticket.fullLocal(ticketId) + + # insert data + @buildHtmlContent(tickets: tickets) + +App.PopoverProvider.registerProvider('UserTicket', UserTicket) diff --git a/app/assets/javascripts/app/lib/app_post/utils.coffee b/app/assets/javascripts/app/lib/app_post/utils.coffee index 7307bcf3dbb9..d199a05775ee 100644 --- a/app/assets/javascripts/app/lib/app_post/utils.coffee +++ b/app/assets/javascripts/app/lib/app_post/utils.coffee @@ -262,6 +262,10 @@ class App.Utils # remove word markup @_removeWordMarkup(html) + # strip out browser-inserted (broken) link + # (see https://github.com/zammad/zammad/issues/2019) + @_stripDoubleDomainAnchors(html) + # remove tags, keep content html.find('font, small, time, form, label').replaceWith( -> $(@).contents() @@ -395,6 +399,15 @@ class App.Utils return window.word_filter(html) html + @_stripDoubleDomainAnchors: (html) -> + html.find('a').each( -> + origHref = $(@).attr('href') + return if !origHref? + + fixedHref = origHref.replace(/^https?:\/\/.*(?=(https?|#{config.http_type}):\/\/)/, '') + if origHref != fixedHref then $(@).attr('href', fixedHref) + ) + # signatureNeeded = App.Utils.signatureCheck(message, signature) @signatureCheck: (message, signature) -> messageText = $('
' + message + '
').text().trim() @@ -412,8 +425,8 @@ class App.Utils else true - # messageWithMarker = App.Utils.signatureIdentify(message, false) - @signatureIdentify: (message, test = false, internal = false) -> + # messageWithMarker = App.Utils.signatureIdentifyByPlaintext(message, false) + @signatureIdentifyByPlaintext: (message, test = false, internal = false) -> textToSearch = @html2text(message) # if we do have less then 10 lines and less then 300 chars ignore this @@ -632,6 +645,64 @@ class App.Utils regex = new RegExp("\>(\s{0,10}#{quote(App.Utils.htmlEscape(markers[0].line))})") message.replace(regex, ">#{markerTemplate}\$1") + @isMicrosoftOffice: (message) -> + regex = new RegExp('-----(Ursprüngliche Nachricht|Original Message|Mensaje original|Message d\'origine|Messaggio originale|邮件原件|原始郵件)-----') + message.match(regex) + + # messageWithMarker = App.Utils.signatureIdentifyByHtml(message) + @signatureIdentifyByHtml: (message) -> + # use the plaintext fallback method if message is composed by Microsoft Office + if @isMicrosoftOffice message + return @signatureIdentifyByPlaintext message + + message_element = $($.parseHTML(message)) + if message_element.length == 1 && $(message_element[0])?.children()?.length + message_element[0].innerHTML = @signatureIdentifyByHtmlHelper(message_element[0].innerHTML) + return message_element[0].outerHTML + + @signatureIdentifyByHtmlHelper(message) + + @signatureIdentifyByHtmlHelper: (message, internal = false) -> + # blockquotes and signature blocks are considered "dismiss nodes" and their indice will be stored + dismissNodes = [] + contentNodes = [] + res = [] + + isQuoteOrSignature = (el) -> + el = $(el) + tag = el.prop("tagName") + return true if tag is 'BLOCKQUOTE' + # detect Zammad's own
marker + return true if tag is 'DIV' && (el.data('signature') || el.prop('class') is 'yahoo_quoted') + _.some el.children(), (el) -> isQuoteOrSignature el + + $('
').html(message).contents().each (index, node) -> + text = $(node).text() + if node.nodeType == Node.TEXT_NODE + res.push text + if text.trim().length + contentNodes.push index + else if node.nodeType == Node.ELEMENT_NODE + res.push node.outerHTML + if isQuoteOrSignature node + dismissNodes.push index + else if text.trim().length + contentNodes.push index + + # filter out all dismiss nodes smaller than the largest content node + max_content = _.max contentNodes || 0 + dismissNodes = _.filter dismissNodes, (x) -> x >= max_content + + # return the message unchanged if there are no nodes to dismiss + return message if !dismissNodes.length + + # insert marker template at the earliest valid location + markerIndex = _.min dismissNodes + markerTemplate = '' + + res.splice(markerIndex, 0, markerTemplate) + res.join('') + # textReplaced = App.Utils.replaceTags( template, { user: { firstname: 'Bob', lastname: 'Smith' } } ) @replaceTags: (template, objects) -> template = template.replace( /#\{\s{0,2}(.+?)\s{0,2}\}/g, (index, key) -> @@ -1021,32 +1092,20 @@ class App.Utils # filter for uniq recipients recipientAddresses = {} addAddresses = (addressLine, line) -> - lineNew = '' recipients = App.Utils.parseAddressListLocal(addressLine) - if !_.isEmpty(recipients) - for recipient in recipients - if !_.isEmpty(recipient) - localRecipientAddress = recipient.toString().toLowerCase() - - # check if address is not local - if !isLocalAddress(localRecipientAddress) - - # filter for uniq recipients - if !recipientAddresses[localRecipientAddress] - recipientAddresses[localRecipientAddress] = true - - # add recipient - if lineNew - lineNew = lineNew + ', ' - lineNew = lineNew + localRecipientAddress - - lineNew - if !_.isEmpty(line) - if !_.isEmpty(lineNew) - lineNew += ', ' - lineNew += line - lineNew + recipients = recipients.map((r) -> r.toString().toLowerCase()) + recipients = _.reject(recipients, (r) -> _.isEmpty(r)) + recipients = _.reject(recipients, (r) -> isLocalAddress(r)) + recipients = _.reject(recipients, (r) -> recipientAddresses[r]) + recipients = _.each(recipients, (r) -> recipientAddresses[r] = true) + + recipients.push(line) if !_.isEmpty(line) + + # see https://github.com/zammad/zammad/issues/2154 + recipients = recipients.map((a) -> a.replace(/'(\S+@\S+\.\S+)'/, '$1')) + + recipients.join(', ') if articleNew.to articleNew.to = addAddresses(articleNew.to) diff --git a/app/assets/javascripts/app/lib/app_post/z_searchable_multiple_select.coffee b/app/assets/javascripts/app/lib/app_post/z_searchable_multiple_select.coffee new file mode 100644 index 000000000000..9e2521b27d20 --- /dev/null +++ b/app/assets/javascripts/app/lib/app_post/z_searchable_multiple_select.coffee @@ -0,0 +1,43 @@ +class App.SearchableMultipleSelect extends App.SearchableAjaxSelect + + events: + 'click .selected_item': 'removeItem' + + elements: + '.items': 'itemList' + + render: -> + @attribute.valueName = '' + display_names = {} + for value in @attribute.value + display_names[value] = App[@attribute.object].findNative(value).name + @attribute.display_names = display_names + + @html App.view('generic/searchable_multiple_select') + attribute: @attribute + options: @renderAllOptions '', @attribute.options, 0 + submenus: @renderSubmenus @attribute.options + + # initial data + @currentMenu = @findMenuContainingValue @attribute.value + @level = @getIndex @currentMenu + + selectItem: (event) -> + return if !event.currentTarget.textContent + @input.val event.currentTarget.textContent.trim() + @input.trigger('change') + data_value = event.currentTarget.getAttribute('data-value') + @input.val '' + js_shadow_ids = $('.js-shadow-ids') + ids = [] + if js_shadow_ids.length > 0 + js_shadow_ids.each( -> ids.push $(this).val() ) + if !ids.includes(data_value) && $(".js-shadow[name='"+@attribute.name+"']").val() != data_value + html = App.view('generic/searchable_multiple_select_item') + title: event.currentTarget.getAttribute('title') + data_value: parseInt(data_value) + name: @attribute.name + @itemList.append html + + removeItem: (event) -> + $(event.currentTarget).closest('div').remove() \ No newline at end of file diff --git a/app/assets/javascripts/app/lib/mixins/popover_providable.coffee b/app/assets/javascripts/app/lib/mixins/popover_providable.coffee new file mode 100644 index 000000000000..40e013f2167b --- /dev/null +++ b/app/assets/javascripts/app/lib/mixins/popover_providable.coffee @@ -0,0 +1,56 @@ +InstanceMethods = + # do not call directly + initializePopovers: -> + @el.on('remove', @removePopovers) + + params = _.extend {}, @constructor.popoversDefaults, + parentController: @ + + @initializedPopovers = @selectedPopovers().map (key) -> + klass = App.Config.get(App.PopoverProvider.providersConfigKey)[key] + new klass(params) + + # returns all or selected popovers + selectedPopovers: -> + if @constructor.allPopovers + popoversConfig = App.Config.get(App.PopoverProvider.providersConfigKey) + return Object.keys(popoversConfig) + + return @constructor.registeredPopovers || [] + + # do not call directly + buildPopovers: (buildParams) -> + for popover in @initializedPopovers + popover.build(buildParams) + + renderPopovers: (buildParams = {}) -> + if !@initializedPopovers + @initializePopovers() + + @buildPopovers(buildParams) + + removePopovers: -> + return if !@initializedPopovers + + for popover in @initializedPopovers + popover.clear() + + @initializedPopovers = undefined + + delayedRemoveAnyPopover: -> + @delay(@constructor.anyPopoversDestroy, 100, 'removePopovers') + +App.PopoverProvidable = + registerPopovers: (klasses...) -> + @allPopovers = undefined + @registeredPopovers = klasses + + registerAllPopovers: -> + @allPopovers = true + + anyPopoversDestroy: -> + # do not remove permanent .popover--notifications widget + $('.popover:not(.popover--notifications)').remove() + + extended: -> + @include InstanceMethods diff --git a/app/assets/javascripts/app/lib/mixins/ticket_navigable.coffee b/app/assets/javascripts/app/lib/mixins/ticket_navigable.coffee index b444923457a3..2ccf557312e0 100644 --- a/app/assets/javascripts/app/lib/mixins/ticket_navigable.coffee +++ b/app/assets/javascripts/app/lib/mixins/ticket_navigable.coffee @@ -5,23 +5,39 @@ # # Relies on @overview_id and @ticket_id instance variables App.TicketNavigable = - openTicket: (ticket_id, url) -> + taskOpenTicket: (ticket_id, url) -> # coerce Ticket objects to id ticket_id = ticket_id.id if (ticket_id instanceof App.Ticket) - - @loadTicketTask(ticket_id) - @navigate url ? "ticket/zoom/#{ticket_id}" + @taskLoadTicket(ticket_id) + @navigate(url ? "ticket/zoom/#{ticket_id}") # preserves overview information - loadTicketTask: (ticket_id) -> + taskLoadTicket: (ticket_id) -> App.TaskManager.execute( key: "Ticket-#{ticket_id}" controller: 'TicketZoom' - params: { ticket_id: ticket_id, overview_id: @overview_id } + params: + ticket_id: ticket_id + overview_id: @overview_id show: true ) - openNextTicketInOverview: -> - return if !(@overview_id? && @ticket?) + taskOpenNextTicketInOverview: -> + if !(@overview_id? && @ticket?) + @taskCloseTicket(true) + return next_ticket = App.Overview.find(@overview_id).nextTicket(@ticket) - @openTicket(next_ticket.id) + if next_ticket + @taskCloseTicket() + @taskLoadTicket(next_ticket.id) + return + @taskCloseTicket(true) + + taskCloseTicket: (openNext = false) -> + App.TaskManager.remove(@taskKey) + return if !openNext + nextTaskUrl = App.TaskManager.nextTaskUrl() + if nextTaskUrl + @navigate nextTaskUrl + return + @navigate '#' diff --git a/app/assets/javascripts/app/models/_application_model.coffee b/app/assets/javascripts/app/models/_application_model.coffee index 50724313b100..12631a50c762 100644 --- a/app/assets/javascripts/app/models/_application_model.coffee +++ b/app/assets/javascripts/app/models/_application_model.coffee @@ -69,12 +69,15 @@ class App.Model extends Spine.Model return @login return '???' + # shows the icon representing the object itself (e. g. the organization icon in organization profile or ticket sidebar) icon: (user) -> '' + # shows icons in a list of objects (e. g. the traffic light rings in the ticket list in user profile) iconTitle: (user) -> '' + # shows icons in the activity stream (e. g. show ! if the activity stream icon is belonging to the session user) iconActivity: (user) -> '' diff --git a/app/assets/javascripts/app/models/overview.coffee b/app/assets/javascripts/app/models/overview.coffee index f5126170a1c1..ed109c5f2838 100644 --- a/app/assets/javascripts/app/models/overview.coffee +++ b/app/assets/javascripts/app/models/overview.coffee @@ -1,5 +1,5 @@ class App.Overview extends App.Model - @configure 'Overview', 'name', 'prio', 'condition', 'order', 'group_by', 'view', 'user_ids', 'organization_shared', 'role_ids', 'active' + @configure 'Overview', 'name', 'prio', 'condition', 'order', 'group_by', 'group_direction', 'view', 'user_ids', 'organization_shared', 'out_of_office', 'role_ids', 'active' @extend Spine.Model.Ajax @url: @apiPath + '/overviews' @configure_attributes = [ @@ -29,7 +29,7 @@ class App.Overview extends App.Model }, { name: 'order::direction' - display: 'Direction' + display: 'Order by Direction' tag: 'select' default: 'down' null: false @@ -53,6 +53,17 @@ class App.Overview extends App.Model group: 'Group' owner: 'Owner' }, + { + name: 'group_direction' + display: 'Group by Direction' + tag: 'select' + default: 'down' + null: false + translate: true + options: + ASC: 'up' + DESC: 'down' + }, { name: 'active', display: 'Active', tag: 'active', default: true }, { name: 'created_by_id', display: 'Created by', relation: 'User', readonly: 1 }, { name: 'created_at', display: 'Created', tag: 'datetime', readonly: 1 }, diff --git a/app/assets/javascripts/app/models/postmaster_filter.coffee b/app/assets/javascripts/app/models/postmaster_filter.coffee index 81092a047e98..28a7eda6c36a 100644 --- a/app/assets/javascripts/app/models/postmaster_filter.coffee +++ b/app/assets/javascripts/app/models/postmaster_filter.coffee @@ -21,3 +21,6 @@ class App.PostmasterFilter extends App.Model 'name', ] @configure_clone = true + + @on 'create', (newRecord) -> + newRecord.channel = 'email' \ No newline at end of file diff --git a/app/assets/javascripts/app/models/taskbar.coffee b/app/assets/javascripts/app/models/taskbar.coffee index 6dfb7d9f05dc..142c1d16302f 100644 --- a/app/assets/javascripts/app/models/taskbar.coffee +++ b/app/assets/javascripts/app/models/taskbar.coffee @@ -1,5 +1,5 @@ class App.Taskbar extends App.Model - @configure 'Taskbar', 'key', 'client_id', 'callback', 'state', 'params', 'prio', 'notify', 'active', 'updated_at' + @configure 'Taskbar', 'key', 'client_id', 'callback', 'state', 'params', 'prio', 'notify', 'active', 'attachments', 'updated_at' # @extend Spine.Model.Local @extend Spine.Model.Ajax @url: @apiPath + '/taskbar' diff --git a/app/assets/javascripts/app/models/ticket.coffee b/app/assets/javascripts/app/models/ticket.coffee index 90e56db84cff..2077615bf30e 100644 --- a/app/assets/javascripts/app/models/ticket.coffee +++ b/app/assets/javascripts/app/models/ticket.coffee @@ -1,12 +1,12 @@ class App.Ticket extends App.Model - @configure 'Ticket', 'number', 'title', 'group_id', 'owner_id', 'customer_id', 'state_id', 'priority_id', 'article', 'tags', 'links', 'updated_at' + @configure 'Ticket', 'number', 'title', 'group_id', 'owner_id', 'customer_id', 'state_id', 'priority_id', 'article', 'tags', 'links', 'updated_at', 'preferences' @extend Spine.Model.Ajax @url: @apiPath + '/tickets' @configure_attributes = [ { name: 'number', display: '#', tag: 'input', type: 'text', limit: 100, null: true, readonly: 1, width: '68px' }, { name: 'title', display: 'Title', tag: 'input', type: 'text', limit: 100, null: false }, { name: 'customer_id', display: 'Customer', tag: 'input', type: 'text', limit: 100, null: false, autocapitalize: false, relation: 'User' }, - { name: 'organization_id', display: 'Organization', tag: 'select', relation: 'Organization', readonly: 1 }, + { name: 'organization_id', display: 'Organization', tag: 'select', relation: 'Organization' }, { name: 'group_id', display: 'Group', tag: 'select', multiple: false, limit: 100, null: false, relation: 'Group', width: '10%', edit: true }, { name: 'owner_id', display: 'Owner', tag: 'select', multiple: false, limit: 100, null: true, relation: 'User', width: '12%', edit: true }, { name: 'state_id', display: 'State', tag: 'select', multiple: false, null: false, relation: 'TicketState', default: 'new', width: '12%', edit: true, customer: true }, diff --git a/app/assets/javascripts/app/models/ticket_article.coffee b/app/assets/javascripts/app/models/ticket_article.coffee index 7c3523ace7b2..99a89a95719c 100644 --- a/app/assets/javascripts/app/models/ticket_article.coffee +++ b/app/assets/javascripts/app/models/ticket_article.coffee @@ -1,5 +1,5 @@ class App.TicketArticle extends App.Model - @configure 'TicketArticle', 'from', 'to', 'cc', 'subject', 'body', 'content_type', 'ticket_id', 'type_id', 'sender_id', 'internal', 'in_reply_to', 'form_id', 'time_unit', 'preferences', 'updated_at' + @configure 'TicketArticle', 'from', 'to', 'cc', 'subject', 'body', 'content_type', 'ticket_id', 'type_id', 'sender_id', 'internal', 'in_reply_to', 'form_id', 'subtype', 'time_unit', 'preferences', 'updated_at' @extend Spine.Model.Ajax @url: @apiPath + '/ticket_articles' @configure_attributes = [ @@ -8,7 +8,7 @@ class App.TicketArticle extends App.Model { name: 'to', display: 'To', tag: 'input', type: 'text', limit: 100, null: true }, { name: 'cc', display: 'Cc', tag: 'input', type: 'text', limit: 100, null: true }, { name: 'subject', display: 'Subject', tag: 'input', type: 'text', limit: 100, null: true }, - { name: 'body', display: 'Text', tag: 'textarea', rows: 5, limit: 100, null: false, searchable: false }, + { name: 'body', display: 'Text', tag: 'textarea', rows: 5, limit: 100, null: false, searchable: true }, { name: 'type_id', display: 'Type', tag: 'select', multiple: false, null: false, relation: 'TicketArticleType', default: '' }, { name: 'sender_id', display: 'Sender', tag: 'select', multiple: false, null: false, relation: 'TicketArticleSender', default: '' }, { name: 'internal', display: 'Visibility', tag: 'radio', default: false, null: true, options: { true: 'internal', false: 'public' } }, diff --git a/app/assets/javascripts/app/models/user.coffee b/app/assets/javascripts/app/models/user.coffee index 9ee5ac0b5fd6..788a724dd618 100644 --- a/app/assets/javascripts/app/models/user.coffee +++ b/app/assets/javascripts/app/models/user.coffee @@ -1,5 +1,5 @@ class App.User extends App.Model - @configure 'User', 'login', 'firstname', 'lastname', 'email', 'web', 'password', 'phone', 'fax', 'mobile', 'street', 'zip', 'city', 'country', 'organization_id', 'department', 'note', 'role_ids', 'group_ids', 'active', 'invite', 'signup', 'updated_at' + @configure 'User', 'login', 'firstname', 'lastname', 'email', 'web', 'password', 'phone', 'fax', 'mobile', 'street', 'zip', 'city', 'country', 'organization_id', 'organization_ids', 'department', 'note', 'role_ids', 'group_ids', 'active', 'invite', 'signup', 'updated_at' @extend Spine.Model.Ajax @url: @apiPath + '/users' @@ -9,15 +9,14 @@ class App.User extends App.Model { name: 'firstname', display: 'Firstname', tag: 'input', type: 'text', limit: 100, null: false, signup: true, info: true, invite_agent: true, invite_customer: true }, { name: 'lastname', display: 'Lastname', tag: 'input', type: 'text', limit: 100, null: false, signup: true, info: true, invite_agent: true, invite_customer: true }, { name: 'email', display: 'Email', tag: 'input', type: 'email', limit: 100, null: false, signup: true, info: true, invite_agent: true, invite_customer: true }, - { name: 'organization_id', display: 'Organization', tag: 'select', multiple: false, nulloption: true, null: true, relation: 'Organization', signup: false, info: true, invite_customer: true }, + { name: 'organization_ids', display: 'Alternative Organization', tag: 'autocompletion_ajax', multiple: true, nulloption: true, null: true, relation: 'Organization', signup: false, info: true, invite_customer: true}, { name: 'created_by_id', display: 'Created by', relation: 'User', readonly: 1 }, { name: 'created_at', display: 'Created at', tag: 'datetime', readonly: 1 }, { name: 'updated_by_id', display: 'Updated by', relation: 'User', readonly: 1 }, { name: 'updated_at', display: 'Updated at', tag: 'datetime', readonly: 1 }, ] @configure_overview = [ -# 'login', 'firstname', 'lastname', 'email', 'updated_at', - 'login', 'firstname', 'lastname', 'organization' + 'login', 'firstname', 'lastname', 'organization_id', 'organization_ids' ] uiUrl: -> @@ -126,7 +125,6 @@ class App.User extends App.Model @constructor.apiPath + '/users/image/' + @image @_fillUp: (data) -> - # set socal media links if data['accounts'] for account of data['accounts'] @@ -135,9 +133,6 @@ class App.User extends App.Model if account == 'facebook' data['accounts'][account]['link'] = 'https://www.facebook.com/profile.php?id=' + data['accounts'][account]['uid'] - if data.organization_id - data.organization = App.Organization.findNative(data.organization_id) - if data['role_ids'] data['roles'] = [] for role_id in data['role_ids'] @@ -145,6 +140,13 @@ class App.User extends App.Model role = App.Role.findNative(role_id) data['roles'].push role + if data['organization_ids'] + data['organizations'] = [] + for organization_id in data['organization_ids'] + if App.Role.exists(organization_id) + organization = App.Organization.findNative(organization_id) + data['organizations'].push organization + if data['group_ids'] data['groups'] = [] for group_id in data['group_ids'] diff --git a/app/assets/javascripts/app/views/agent_ticket_view/detail.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view/detail.jst.eco index 050a35b40305..ba30a90de093 100644 --- a/app/assets/javascripts/app/views/agent_ticket_view/detail.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_view/detail.jst.eco @@ -12,7 +12,7 @@ <%- ticket.customer.avatar("50", "", "userInfo-avatar") %> -

<%= ticket.title %>

+

<%= ticket.title || '-' %>

diff --git a/app/assets/javascripts/app/views/cti/caller_log.jst.eco b/app/assets/javascripts/app/views/cti/caller_log.jst.eco index d00c71e4a409..7a962111c8a7 100644 --- a/app/assets/javascripts/app/views/cti/caller_log.jst.eco +++ b/app/assets/javascripts/app/views/cti/caller_log.jst.eco @@ -25,24 +25,30 @@ <% for caller_id in item.preferences.from: %> <% if caller_id.user_id && App.User.exists(caller_id.user_id): %> <% shown = true %> - <% user = App.User.find(caller_id.user_id) %> + <% user = App.User.fullLocal(caller_id.user_id) %> + <% classes = ['user-popover'] %> + <% classes.push('is-inactive') if !user.active %> <% if caller_id.level isnt 'known': %><%- @T('maybe') %> <% end %> - <%= user.displayNameLong() %>
- <% else if caller_id.comment: %> + <%= user.displayNameLong() %>
+ <% else if !_.isEmpty(caller_id.comment): %> <% shown = true %> <%- @T('maybe') %> <%= caller_id.comment %>
<% end %> <% end %> <% end %> - <% if !shown && item.from_comment: %> + <% if !shown && !_.isEmpty(item.from_comment): %> <% shown = true %> - <% if item.from_comment: %><%= item.from_comment %><% end %> + <%= item.from_comment %>
<% end %> <% if shown: %> <%= item.from_pretty %> <% else: %> - <%= item.from_pretty %> + <% if !_.isEmpty(item.from_pretty): %> + <%= item.from_pretty %> + <% else: %> + <%= item.from %> + <% end %> <% end %> - <% if @params.data_option && @params.data_option.options: %> - <% for key, display of @params.data_option.options: %> + <% if @params.data_option && @params.data_option.sorted: %> + <% for [key, display] in @params.data_option.sorted: %>
@@ -51,24 +57,30 @@ <% for caller_id in item.preferences.to: %> <% if caller_id.user_id && App.User.exists(caller_id.user_id): %> <% shown = true %> - <% user = App.User.find(caller_id.user_id) %> + <% user = App.User.fullLocal(caller_id.user_id) %> + <% classes = ['user-popover'] %> + <% classes.push('is-inactive') if !user.active %> <% if caller_id.level isnt 'known': %><%- @T('maybe') %> <% end %> - <%= user.displayNameLong() %>
- <% else if caller_id.comment: %> + <%= user.displayNameLong() %>
+ <% else if !_.isEmpty(caller_id.comment): %> <% shown = true %> <%- @T('maybe') %> <%= caller_id.comment %>
<% end %> <% end %> <% end %> - <% if !shown && item.to_comment: %> + <% if !shown && !_.isEmpty(item.to_comment): %> <% shown = true %> - <% if item.to_comment: %><%= item.to_comment %><% end %> + <%= item.to_comment %>
<% end %> <% if shown: %> <%= item.to_pretty %> <% else: %> - <%= item.to_pretty %> + <% if !_.isEmpty(item.to_pretty): %> + <%= item.to_pretty %> + <% else: %> + <%= item.to %> + <% end %> <% end %> 		diff --git a/app/assets/javascripts/app/views/generic/attachment.jst.eco b/app/assets/javascripts/app/views/generic/attachment.jst.eco index 9b9328a01a07..827312ade3fa 100644 --- a/app/assets/javascripts/app/views/generic/attachment.jst.eco +++ b/app/assets/javascripts/app/views/generic/attachment.jst.eco @@ -2,8 +2,11 @@
- <%- @T('select attachment...') %> - + <% uid = _.uniqueId('fileUpload_') %> + +
diff --git a/app/assets/javascripts/app/views/generic/postmaster_set.jst.eco b/app/assets/javascripts/app/views/generic/postmaster_set.jst.eco index 32f35019bcc5..4016a6f48e8e 100644 --- a/app/assets/javascripts/app/views/generic/postmaster_set.jst.eco +++ b/app/assets/javascripts/app/views/generic/postmaster_set.jst.eco @@ -1,26 +1 @@ -
-
-
-
-
- <%- @Icon('arrow-down', 'dropdown-arrow') %> -
-
-
-
- - <%- @Icon('arrow-down') %> -
-
-
-
-
-
- <%- @Icon('minus-small') %> -
-
- <%- @Icon('plus-small') %> -
-
-
-
+
diff --git a/app/assets/javascripts/app/views/generic/postmaster_set_row.jst.eco b/app/assets/javascripts/app/views/generic/postmaster_set_row.jst.eco new file mode 100644 index 000000000000..a15c52daf99f --- /dev/null +++ b/app/assets/javascripts/app/views/generic/postmaster_set_row.jst.eco @@ -0,0 +1,24 @@ +
+
+
+
+ <%- @Icon('arrow-down', 'dropdown-arrow') %> +
+
+
+
+ + <%- @Icon('arrow-down') %> +
+
+
+
+
+
+ <%- @Icon('minus-small') %> +
+
+ <%- @Icon('plus-small') %> +
+
+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/searchable_multiple_select.jst.eco b/app/assets/javascripts/app/views/generic/searchable_multiple_select.jst.eco new file mode 100644 index 000000000000..6d6170b0cb4b --- /dev/null +++ b/app/assets/javascripts/app/views/generic/searchable_multiple_select.jst.eco @@ -0,0 +1,33 @@ +
+ " + placeholder="<%= @attribute.placeholder %>" + value="<%= @attribute.valueName %>" + autocomplete="off" + <%= @attribute.required %> + > +
+ + +
+ <% if !@attribute.ajax: %><%- @Icon('arrow-down', 'dropdown-arrow') %><% end %> +
+
+
+ + <%- @submenus %> +
+
+ <% if @attribute.value: %> + <% for value in @attribute.value: %> +
+ + <%- @attribute.display_names[value] %> + + +
+ <% end %> + <% end %> +
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/searchable_multiple_select_item.jst.eco b/app/assets/javascripts/app/views/generic/searchable_multiple_select_item.jst.eco new file mode 100644 index 000000000000..177f4ec65cf4 --- /dev/null +++ b/app/assets/javascripts/app/views/generic/searchable_multiple_select_item.jst.eco @@ -0,0 +1,4 @@ +
+ <%= @title %> + > +
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/searchable_select.jst.eco b/app/assets/javascripts/app/views/generic/searchable_select.jst.eco index ea66976d6fe1..70259c5c82b8 100644 --- a/app/assets/javascripts/app/views/generic/searchable_select.jst.eco +++ b/app/assets/javascripts/app/views/generic/searchable_select.jst.eco @@ -6,6 +6,7 @@ <%= @attribute.required %> <%= @attribute.autofocus %> value="<%= @attribute.value %>" + tabindex="-1" > " diff --git a/app/assets/javascripts/app/views/generic/ticket_perform_action/index.jst.eco b/app/assets/javascripts/app/views/generic/ticket_perform_action/index.jst.eco index d2bb37cbd4ae..2fb4b2817786 100644 --- a/app/assets/javascripts/app/views/generic/ticket_perform_action/index.jst.eco +++ b/app/assets/javascripts/app/views/generic/ticket_perform_action/index.jst.eco @@ -1,21 +1 @@ -
-
-
-
-
- <%- @Icon('arrow-down', 'dropdown-arrow') %> -
-
-
-
-
-
-
- <%- @Icon('minus-small') %> -
-
- <%- @Icon('plus-small') %> -
-
-
-
\ No newline at end of file +
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/ticket_perform_action/row.jst.eco b/app/assets/javascripts/app/views/generic/ticket_perform_action/row.jst.eco new file mode 100644 index 000000000000..661b772f8bd9 --- /dev/null +++ b/app/assets/javascripts/app/views/generic/ticket_perform_action/row.jst.eco @@ -0,0 +1,19 @@ +
+
+
+
+ <%- @Icon('arrow-down', 'dropdown-arrow') %> +
+
+
+
+
+
+
+ <%- @Icon('minus-small') %> +
+
+ <%- @Icon('plus-small') %> +
+
+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/integration/idoit_object_selector.jst.eco b/app/assets/javascripts/app/views/integration/idoit_object_selector.jst.eco index fa63a3604103..aa6ded2aa5b5 100644 --- a/app/assets/javascripts/app/views/integration/idoit_object_selector.jst.eco +++ b/app/assets/javascripts/app/views/integration/idoit_object_selector.jst.eco @@ -1,5 +1,5 @@
- +
diff --git a/app/assets/javascripts/app/views/link/info.jst.eco b/app/assets/javascripts/app/views/link/info.jst.eco index 52b191925179..7a757986e433 100644 --- a/app/assets/javascripts/app/views/link/info.jst.eco +++ b/app/assets/javascripts/app/views/link/info.jst.eco @@ -9,7 +9,7 @@ <%- @Icon('task-state', item.iconClass()) %>
- <%= item.title %> + <%= item.title || '-' %> <%- @humanTime(item.created_at) %>
diff --git a/app/assets/javascripts/app/views/object_manager/attribute/select.jst.eco b/app/assets/javascripts/app/views/object_manager/attribute/select.jst.eco index 448859052412..3328f631ece7 100644 --- a/app/assets/javascripts/app/views/object_manager/attribute/select.jst.eco +++ b/app/assets/javascripts/app/views/object_manager/attribute/select.jst.eco @@ -8,8 +8,8 @@
<%- @T('Action') %>
diff --git a/app/assets/javascripts/app/views/popover/organization.jst.eco b/app/assets/javascripts/app/views/popover/organization.jst.eco index 1a25b08b539b..9f6bbef46e84 100644 --- a/app/assets/javascripts/app/views/popover/organization.jst.eco +++ b/app/assets/javascripts/app/views/popover/organization.jst.eco @@ -1,19 +1,11 @@ -
-<% for row in @organizationData: %> - <% if @organization[row.name]: %> -
- - <%- @P( @organization, row.name ) %> -
- <% end %> -<% end %> - -<% if @organization.members: %> +<%- @V('popover/single_object_generic', object: @object, attributes: @attributes) %> + +<% if @object.members: %>
- <% for user in @organization.members: %> + <% for user in @object.members: %>
<%= user.displayName() %>
<% end %>
-<% end %> \ No newline at end of file +<% end %> diff --git a/app/assets/javascripts/app/views/popover/single_object_generic.jst.eco b/app/assets/javascripts/app/views/popover/single_object_generic.jst.eco new file mode 100644 index 000000000000..b317a4e6a4b0 --- /dev/null +++ b/app/assets/javascripts/app/views/popover/single_object_generic.jst.eco @@ -0,0 +1,12 @@ +<% if !_.isEmpty(@attributes): %> +
+<% end %> + +<% for row in @attributes: %> + <% if @object[row.name]: %> +
+ + <%- @P( @object, row.name ) %> +
+ <% end %> +<% end %> diff --git a/app/assets/javascripts/app/views/popover/ticket.jst.eco b/app/assets/javascripts/app/views/popover/ticket.jst.eco index 819ffdaa750c..b124eb3b7eb9 100644 --- a/app/assets/javascripts/app/views/popover/ticket.jst.eco +++ b/app/assets/javascripts/app/views/popover/ticket.jst.eco @@ -1,22 +1,22 @@
- <%- @Icon(@ticket.icon(), @ticket.iconClass()) %> <%- @ticket.iconTitle() %> + <%- @Icon(@object.icon(), @object.iconClass()) %> <%- @object.iconTitle() %>
- <%= @ticket.owner.displayName() %> - <% if @ticket.owner.organization: %> - <%= @ticket.owner.organization.displayName() %> + <%= @object.owner.displayName() %> + <% if @object.owner.organization: %> + <%= @object.owner.organization.displayName() %> <% end %>
- <%= @ticket.customer.displayName() %> - <% if @ticket.customer.organization: %> - <%= @ticket.customer.organization.displayName() %> + <%= @object.customer.displayName() %> + <% if @object.customer.organization: %> + <%= @object.customer.organization.displayName() %> <% end %>
@@ -24,18 +24,18 @@
-
<%- @P(@ticket, 'number') %>
+
<%- @P(@object, 'number') %>
-
<%- @P(@ticket, 'priority') %>
+
<%- @P(@object, 'priority') %>
-
<%- @P(@ticket, 'created_at') %>
+
<%- @P(@object, 'created_at') %>
-
<%- @P(@ticket, 'group') %>
+
<%- @P(@object, 'group') %>
-
\ No newline at end of file + diff --git a/app/assets/javascripts/app/views/popover/user.jst.eco b/app/assets/javascripts/app/views/popover/user.jst.eco index 7fcc636ee71a..b2bc622c7cbb 100644 --- a/app/assets/javascripts/app/views/popover/user.jst.eco +++ b/app/assets/javascripts/app/views/popover/user.jst.eco @@ -1,25 +1,20 @@ -<% if @user['organization']: %> -
<%= @user.organization.displayName() %>
+<% if @object['organization']: %> +
<%= @object.organization.displayName() %>
<% end %> -
-<% for row in @userData: %> - <% if @user[row.name]: %> + +<%- @V('popover/single_object_generic', object: @object, attributes: @attributes) %> +<% if !_.isEmpty(@object['accounts']): %> +
- - <%- @P(@user, row.name) %> + + <% for account of @object['accounts']: %> + <%= account %> + <% end %>
- <% end %> -<% end %> -<% if !_.isEmpty(@user['accounts']): %> -
- - <% for account of @user['accounts']: %> - <%= account %> - <% end %> -
<% end %> -<% if !_.isEmpty(@user['links']): %> - <% for link in @user['links']: %> +<% if !_.isEmpty(@object['links']): %> +
+ <% for link in @object['links']: %>
<% for item in link['items']: %> @@ -37,4 +32,4 @@ <% end %>
<% end %> -<% end %> \ No newline at end of file +<% end %> diff --git a/app/assets/javascripts/app/views/popover/user_ticket_list.jst.eco b/app/assets/javascripts/app/views/popover/user_ticket_list.jst.eco index 9216f53d1cd4..65de820b56cb 100644 --- a/app/assets/javascripts/app/views/popover/user_ticket_list.jst.eco +++ b/app/assets/javascripts/app/views/popover/user_ticket_list.jst.eco @@ -5,7 +5,7 @@ <%- @Icon('task-state', ticket.iconClass()) %>
- #<%= ticket.number %> <%= ticket.title %> + #<%= ticket.number %> <%= ticket.title || '-' %> <%- @humanTime(ticket.created_at, false, 'time') %>
diff --git a/app/assets/javascripts/app/views/ticket_overview/batch_overlay_user_group.jst.eco b/app/assets/javascripts/app/views/ticket_overview/batch_overlay_user_group.jst.eco index 2931f9bd3455..db765db7158d 100644 --- a/app/assets/javascripts/app/views/ticket_overview/batch_overlay_user_group.jst.eco +++ b/app/assets/javascripts/app/views/ticket_overview/batch_overlay_user_group.jst.eco @@ -8,6 +8,6 @@
<%- group.avatar(80) %>
<%- group.displayName() %>
-
<%- @T('%s people', group.valid_user_ids.length) %>
+
<%- @T('%s people', group.valid_users_count) %>
<% end %> \ No newline at end of file diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco index a4d1ae0b3400..d58e451e3e58 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco @@ -2,6 +2,7 @@ +
@@ -68,9 +69,12 @@
<%- @T('Enter Answer or') %> - - <%- @T('select attachment...') %> - + + <% uid = _.uniqueId('fileUpload_') %> + +
diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco index b15af64009fe..348805aa21d9 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco @@ -93,6 +93,7 @@
<%- @Icon(@article.type.name, 'article-meta-icon') %> <%- @T(@article.type.name) %> +
<% if @links: %> <% count = 0 %> <% for link in @links: %> @@ -101,6 +102,7 @@ <% count =+ 1 %> <% end %> <% end %> +
diff --git a/app/assets/javascripts/app/views/ticket_zoom/attribute_bar.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/attribute_bar.jst.eco index c95c7d83749b..65bec635a647 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/attribute_bar.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/attribute_bar.jst.eco @@ -24,16 +24,18 @@
+
<% if @macroDisabled: %> -
<%- @T('Update') %>
+ <% else: %>
-
<%- @T('Update') %>
-
<%- @Icon('arrow-up') %>
+ +
-<% end %> \ No newline at end of file +<% end %> +
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/ticket_zoom/title.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/title.jst.eco index c4d66f32c6e0..7687f434fe55 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/title.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/title.jst.eco @@ -1 +1 @@ -
<%= @object.title %>
\ No newline at end of file +
<%= @object.title || '-' %>
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/time_accounting/by_ticket.jst.eco b/app/assets/javascripts/app/views/time_accounting/by_ticket.jst.eco index 0f395dbf9295..802dd1c93ac9 100644 --- a/app/assets/javascripts/app/views/time_accounting/by_ticket.jst.eco +++ b/app/assets/javascripts/app/views/time_accounting/by_ticket.jst.eco @@ -20,7 +20,7 @@ <% for row in @rows: %>
<%= row.ticket.number %> - <%= row.ticket.title %> + <%= row.ticket.title || '-' %> <%= row.customer %> <%= row.organization %> <%= row.agent %> diff --git a/app/assets/javascripts/app/views/user_profile/index.jst.eco b/app/assets/javascripts/app/views/user_profile/index.jst.eco index 601eca945600..8ee5b2572b20 100644 --- a/app/assets/javascripts/app/views/user_profile/index.jst.eco +++ b/app/assets/javascripts/app/views/user_profile/index.jst.eco @@ -4,9 +4,12 @@
<%- @user.avatar("80") %>

- <% if @user.organization: %> + <% if @user.organization_id: %>
<% end %> + <% for org in @user.organizations: %> +
+ <% end %>
diff --git a/app/assets/javascripts/app/views/widget/organization.jst.eco b/app/assets/javascripts/app/views/widget/organization.jst.eco index 5935cfdc6767..2b5d2daf9049 100644 --- a/app/assets/javascripts/app/views/widget/organization.jst.eco +++ b/app/assets/javascripts/app/views/widget/organization.jst.eco @@ -8,7 +8,7 @@ <% for row in @organizationData: %> - <% if @organization[row.name] || row.name is 'note': %> + <% if @organization[row.name]? || row.name is 'note': %>
<% if row.tag isnt 'richtext': %> diff --git a/app/assets/javascripts/app/views/widget/ticket_stats_list.jst.eco b/app/assets/javascripts/app/views/widget/ticket_stats_list.jst.eco index 43845ece2b64..1cf1bae105bc 100644 --- a/app/assets/javascripts/app/views/widget/ticket_stats_list.jst.eco +++ b/app/assets/javascripts/app/views/widget/ticket_stats_list.jst.eco @@ -8,7 +8,7 @@ <%- @Icon('task-state', ticket.iconClass()) %>
- <%= ticket.title %> + <%= ticket.title || '-' %> <%- @humanTime(ticket.created_at, false, 'time') %>
diff --git a/app/assets/javascripts/app/views/widget/user.jst.eco b/app/assets/javascripts/app/views/widget/user.jst.eco index fbb0a0215683..b38bea0c2d98 100644 --- a/app/assets/javascripts/app/views/widget/user.jst.eco +++ b/app/assets/javascripts/app/views/widget/user.jst.eco @@ -3,7 +3,7 @@

<%= @user.displayName() %>

<% for row in @userData: %> - <% if @user[row.name] || row.name is 'note': %> + <% if @user[row.name]? || row.name is 'note': %>
<% if row.tag isnt 'richtext': %> diff --git a/app/assets/stylesheets/print.scss b/app/assets/stylesheets/print.scss index 9bb773c0aa94..d0f7588ffdb7 100644 --- a/app/assets/stylesheets/print.scss +++ b/app/assets/stylesheets/print.scss @@ -11,6 +11,29 @@ border-bottom: 1px solid hsl(0,0%,90%); } +html { + height: auto; +} + +body, +.content { + background: none; + color: black; +} + +// Disable flex to allow multi page prints in Firefox: https://bugzilla.mozilla.org/show_bug.cgi?id=939897 +body, +#app, +#app > .content.active, +.tabsSidebar-holder, +main { + display: block; +} + +#app { + min-width: 0; +} + /* Dashboard @@ -32,10 +55,47 @@ .bulkAction, .overviews .checkbox-replacement, .overviews .overview-header, -.table-checkbox { +.table-checkbox, +.sidebar, +.page-header-meta .btn { + display: none; +} + +.main { + padding: 0; +} + +h1, .popover-notificationsHeader .popover-title, .ticket-title-update, h2, h3, h4, h5, h6 { + color: inherit; +} + +.table { + border: none; + color: black; + + > thead > tr > th { + background: none; + color: inherit; + } +} + +td a { + color: black; + font-weight: 500; +} + +.table-col-resize { display: none; } +th.js-tableHead:not([data-column-key="icon"]) { + width: auto !important; +} + +.icon-task-state.open { + fill: gray; +} + /* Ticket Zoom @@ -54,9 +114,138 @@ } .tabsSidebar-sidebarSpacer { - margin-right: 0; + margin: 0; + transition: none; +} + +.textBubble-content { + height: auto !important; +} + +.tabsSidebar-tabsSpacer { + padding: 0 !important; + overflow: visible; } -.article-meta .article-meta-key { +.ticketZoom { + background: none; +} + +.ticket-article, +.article-new { + max-width: none; + padding-left: 0; + padding-right: 0; +} + +.ticket-article { + a[href]:after { + content: none !important; + } +} + +.textBubble { + padding: 20px; + border: 1px solid !important; + background: white !important; +} + +.bubble-arrow:after { + background: white !important; + border-color: black !important; +} + +.article-meta { + color: black; + background: none; + border: 1px dashed hsl(240,2%,60%); + padding: 11px 10px 1px; + + &.top { + border-bottom-width: 0; + } + + &.bottom { + border-top-width: 0; + padding-top: 7px; + padding-bottom: 3px; + } + + &-clip { + height: auto !important; + } + + &-icon { + fill: currentColor; + } +} + +.article-meta-links { display: none; +} + +.article-content { + color: inherit; +} + +.article-content-meta { + opacity: 1 !important; + display: block !important; + transform: none !important; + position: static; +} + +.attachments.attachments--list { + border-color: currentColor !important; +} + +.avatar { + border: 1px solid black; +} + + + +/* + + Modal + ===== + +*/ + +.modal-open { + > *:not(.modal) { + display: none !important; + } +} + +.modal { + width: auto !important; + position: static; + padding: 0 !important; +} + +.modal-backdrop { + display: none; +} + +.modal-dialog { + box-shadow: none !important; + max-width: none !important; + margin: 0; +} + +.modal-content { + border: none; +} + +.modal-close { + display: none; +} + +.modal-footer { + display: none; +} + +.modal-body { + padding: 0; } \ No newline at end of file diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 19233051e4d6..4d875dc4f1b9 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -1053,7 +1053,7 @@ th.align-right { padding: 0; } -.table tr.is-inactive { +.table tr.is-inactive, .table tr td span.is-inactive { color: #bbb; text-decoration: line-through; @@ -1358,7 +1358,8 @@ label, .inline-label, .label-success, .label-warning, -.label-danger { +.label-danger, +.fileUpload label { font-size: inherit; font-weight: inherit; text-align: inherit; @@ -4728,11 +4729,6 @@ footer { .ticketZoom { background: #f8f9fa; - /* - force ticket zoom to show scrollbars - because we offset the tabs bar when the os shows scrollbars - */ - min-height: 101%; } .ticketZoom-controls { @@ -5545,6 +5541,12 @@ footer { .tabsSidebar-tabsSpacer { @include bidi-style(padding-right, 62px !important, padding-left, 0); + /* + force div to show scrollbars + because we offset the sidebar tabs when the os shows scrollbars + */ + overflow-x: hidden; + overflow-y: scroll; } .tabsSidebar-sidebarSpacer { @@ -7377,6 +7379,10 @@ label + .wizard-buttonList { padding: 0; @extend %clickable; opacity: 0; + + &:focus + label { + text-decoration: underline; + } } .imagePreview img { @@ -8124,6 +8130,11 @@ output { .searchableSelect { position: relative; + .selected_item { + cursor: pointer; + padding-left: 3px; + } + .form-control { padding-right: 37px; @include bidi-style(padding-right, 37px, padding-left, 12px); @@ -8148,6 +8159,10 @@ output { margin-top: -3px; max-width: 100%; } + .dropdown-menu-multiple { + margin-top: 0; + top: 39px; + } &-option-text { flex: 1 1 0%; diff --git a/app/controllers/application_controller/handles_errors.rb b/app/controllers/application_controller/handles_errors.rb index 98c1728f779b..7d631e2370c0 100644 --- a/app/controllers/application_controller/handles_errors.rb +++ b/app/controllers/application_controller/handles_errors.rb @@ -45,7 +45,9 @@ def respond_to_exception(e, status) respond_to do |format| format.json { render json: humanize_error(e.message), status: status } format.any do + errors = humanize_error(e.message) @exception = e + @message = errors[:error_human] || errors[:error] || param[:message] @traceback = !Rails.env.production? file = File.open(Rails.root.join('public', "#{status_code}.html"), 'r') render inline: file.read, status: status diff --git a/app/controllers/application_controller/prevents_csrf.rb b/app/controllers/application_controller/prevents_csrf.rb index ba7450fac87d..240daa8742a6 100644 --- a/app/controllers/application_controller/prevents_csrf.rb +++ b/app/controllers/application_controller/prevents_csrf.rb @@ -14,8 +14,10 @@ def set_csrf_token_headers end def verify_csrf_token - return true if request.method != 'POST' && request.method != 'PUT' && request.method != 'DELETE' && request.method != 'PATCH' - return true if @_auth_type == 'token_auth' || @_auth_type == 'basic_auth' + return true if !protect_against_forgery? + return true if request.get? + return true if request.head? + return true if %w[token_auth basic_auth].include?(@_auth_type) return true if valid_authenticity_token?(session, params[:authenticity_token] || request.headers['X-CSRF-Token']) logger.info 'CSRF token verification failed' raise Exceptions::NotAuthorized, 'CSRF token verification failed!' diff --git a/app/controllers/concerns/creates_ticket_articles.rb b/app/controllers/concerns/creates_ticket_articles.rb index ca1e2eb6a8ce..df7741c3a8bc 100644 --- a/app/controllers/concerns/creates_ticket_articles.rb +++ b/app/controllers/concerns/creates_ticket_articles.rb @@ -8,6 +8,7 @@ def article_create(ticket, params) # create article if given form_id = params[:form_id] params.delete(:form_id) + subtype = params.delete(:subtype) # check min. params raise Exceptions::UnprocessableEntity, 'Need at least article: { body: "some text" }' if !params[:body] @@ -59,6 +60,10 @@ def article_create(ticket, params) o_id: form_id, ) end + + # set subtype of present + article.preferences[:subtype] = subtype if subtype.present? + article.save! # store inline attachments @@ -89,14 +94,17 @@ def article_create(ticket, params) preferences[store_key] = attachment[key] end - if !attachment[:data].match?(%r{^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{4}|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)$}) + begin + base64_data = attachment[:data].gsub(/[\r\n]/, '') + attachment_data = Base64.strict_decode64(base64_data) + rescue ArgumentError => e raise Exceptions::UnprocessableEntity, "Invalid base64 for attachment with index '#{index}'" end Store.add( object: 'Ticket::Article', o_id: article.id, - data: Base64.decode64(attachment[:data]), + data: attachment_data, filename: attachment[:filename], preferences: preferences, ) @@ -114,6 +122,12 @@ def article_create(ticket, params) return article if form_id.blank? + # clear in-progress state from taskbar + Taskbar + .where(user_id: current_user.id) + .first { |taskbar| taskbar.persisted_form_id == form_id } + &.update!(state: {}) + # remove attachments from upload cache Store.remove( object: 'UploadCache', diff --git a/app/controllers/external_credentials_controller.rb b/app/controllers/external_credentials_controller.rb index 5b68e9f3c09d..af387cae3ff4 100644 --- a/app/controllers/external_credentials_controller.rb +++ b/app/controllers/external_credentials_controller.rb @@ -1,7 +1,7 @@ # Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/ class ExternalCredentialsController < ApplicationController - prepend_before_action { authentication_check(permission: ['admin.channel_twitter', 'admin.channel_facebook']) } + prepend_before_action :permission_check def index model_index_render(ExternalCredential, params) @@ -54,4 +54,27 @@ def app_url(provider, channel_id) ExternalCredential.app_url(provider, channel_id) end + def permission_check + if params[:id].present? && ExternalCredential.exists?(params[:id]) + external_credential = ExternalCredential.find(params[:id]) + raise 'No such ExternalCredential!' if !external_credential + authentication_check(permission: ["admin.channel_#{external_credential.name}"]) + return + end + + if params[:name].present? || params[:provider].present? + if params[:name].present? + name = params[:name].downcase + elsif params[:provider].present? + name = params[:provider].downcase + else + raise 'Missing name/provider!' + end + authentication_check(permission: ["admin.channel_#{name}"]) + return + end + + authentication_check(permission: ['admin']) + end + end diff --git a/app/controllers/integration/exchange_controller.rb b/app/controllers/integration/exchange_controller.rb index 7f7f2c20d39b..68778bed18d0 100644 --- a/app/controllers/integration/exchange_controller.rb +++ b/app/controllers/integration/exchange_controller.rb @@ -16,18 +16,21 @@ def autodiscover client.http.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE end - { - endpoint: client.try(:autodiscover).try(:ews_url), - } + begin + { endpoint: client.autodiscover&.ews_url } + rescue Errno::EADDRNOTAVAIL + {} + end end end def folders answer_with do Sequencer.process('Import::Exchange::AvailableFolders', - parameters: { - ews_config: ews_config - }) + parameters: { ews_config: ews_config }) + .tap do |res| + raise 'No folders found for given user credentials.' if res[:folders].blank? + end end end @@ -35,14 +38,12 @@ def mapping answer_with do raise 'Please select at least one folder.' if params[:folders].blank? - examples = Sequencer.process('Import::Exchange::AttributesExamples', - parameters: { - ews_folder_ids: params[:folders], - ews_config: ews_config - }) - examples.tap do |result| - raise 'No entries found in selected folder(s).' if result[:attributes].blank? - end + Sequencer.process('Import::Exchange::AttributesExamples', + parameters: { ews_folder_ids: params[:folders], + ews_config: ews_config }) + .tap do |res| + raise 'No entries found in selected folder(s).' if res[:attributes].blank? + end end end diff --git a/app/controllers/integration/idoit_controller.rb b/app/controllers/integration/idoit_controller.rb index 7bfe3067a079..6ca1591138fe 100644 --- a/app/controllers/integration/idoit_controller.rb +++ b/app/controllers/integration/idoit_controller.rb @@ -38,10 +38,12 @@ def query def update params[:object_ids] ||= [] ticket = Ticket.find(params[:ticket_id]) - access!(ticket, 'read') - ticket.preferences[:idoit] ||= {} - ticket.preferences[:idoit][:object_ids] = Array(params[:object_ids]).uniq - ticket.save! + ticket.with_lock do + access!(ticket, 'read') + ticket.preferences[:idoit] ||= {} + ticket.preferences[:idoit][:object_ids] = Array(params[:object_ids]).uniq + ticket.save! + end render json: { result: 'ok', diff --git a/app/controllers/monitoring_controller.rb b/app/controllers/monitoring_controller.rb index aca2d5b665ec..e477cd3b3f8c 100644 --- a/app/controllers/monitoring_controller.rb +++ b/app/controllers/monitoring_controller.rb @@ -46,7 +46,8 @@ def health_check issues.push "#{message} #{channel.last_log_in}" end if channel.preferences && channel.preferences['last_fetch'] && channel.preferences['last_fetch'] < last_run_tolerance - issues.push "#{message} channel is active but not fetched for 1 hour" + diff = Time.zone.now - channel.preferences['last_fetch'] + issues.push "#{message} channel is active but not fetched for #{helpers.time_ago_in_words(Time.zone.now - diff.seconds)} hour" end # outbound channel @@ -71,11 +72,11 @@ def health_check end end - # scheduler check - Scheduler.where(active: true).where.not(last_run: nil).each do |scheduler| - next if scheduler.period <= 300 - next if scheduler.last_run + scheduler.period.seconds > Time.zone.now - 5.minutes - issues.push 'scheduler not running' + # scheduler running check + Scheduler.where('active = ? AND period > 300', true).where.not(last_run: nil).order(last_run: :asc, period: :asc).each do |scheduler| + diff = Time.zone.now - (scheduler.last_run + scheduler.period.seconds) + next if diff < 8.minutes + issues.push "scheduler may not run (last execution of #{scheduler.method} #{helpers.time_ago_in_words(Time.zone.now - diff.seconds)} over) - please contact your system administrator" break end if Scheduler.where(active: true, last_run: nil).count == Scheduler.where(active: true).count @@ -90,19 +91,23 @@ def health_check # failed jobs check failed_jobs = Delayed::Job.where('attempts > 0') count_failed_jobs = failed_jobs.count - if count_failed_jobs > 10 - issues.push "#{count_failed_jobs} failing background jobs." + issues.push "#{count_failed_jobs} failing background jobs" end listed_failed_jobs = failed_jobs.select(:handler, :attempts).limit(10) - listed_failed_jobs.group_by(&:name).each_with_index do |(name, jobs), index| - + sorted_failed_jobs = listed_failed_jobs.group_by(&:name).sort_by { |_handler, entries| entries.length }.reverse.to_h + sorted_failed_jobs.each_with_index do |(name, jobs), index| attempts = jobs.map(&:attempts).sum - issues.push "Failed to run background job ##{index += 1} '#{name}' #{jobs.count} time(s) with #{attempts} attempt(s)." end + # job count check + total_jobs = Delayed::Job.where('created_at < ?', Time.zone.now - 15.minutes).count + if total_jobs > 8000 + issues.push "#{total_jobs} background jobs in queue" + end + # import jobs import_backends = ImportJob.backends diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 80886e95c75f..00bbb453891a 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -246,6 +246,8 @@ def search query: query, limit: per_page, offset: offset, + sort_by: params[:sort_by], + order_by: params[:order_by], current_user: current_user, } if params[:role_ids].present? diff --git a/app/controllers/sessions/collection_base.rb b/app/controllers/sessions/collection_base.rb index 87464301a079..5eb225a0b304 100644 --- a/app/controllers/sessions/collection_base.rb +++ b/app/controllers/sessions/collection_base.rb @@ -37,8 +37,8 @@ def session( collections, assets, user ) end collections[ Organization.to_app_model ] = [] - if user.organization_id - Organization.where(id: user.organization_id).each do |item| + if user.organizations.any? + user.organizations.each do |item| assets = item.assets(assets) end end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index fef102c5f2d0..e7e34d000201 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -2,7 +2,7 @@ class SessionsController < ApplicationController prepend_before_action :authentication_check, only: %i[switch_to_user list delete] - skip_before_action :verify_csrf_token, only: %i[create show destroy create_omniauth create_sso] + skip_before_action :verify_csrf_token, only: %i[create show destroy create_omniauth failure_omniauth create_sso] # "Create" a login, aka "log the user in" def create @@ -165,6 +165,10 @@ def create_omniauth redirect_to '/' end + def failure_omniauth + raise Exceptions::UnprocessableEntity, "Message from #{params[:strategy]}: #{params[:message]}" + end + def create_sso # in case, remove switched_from_user_id diff --git a/app/controllers/ticket_articles_controller.rb b/app/controllers/ticket_articles_controller.rb index 2e10840236c0..110321e63e5c 100644 --- a/app/controllers/ticket_articles_controller.rb +++ b/app/controllers/ticket_articles_controller.rb @@ -112,6 +112,9 @@ def update clean_params = Ticket::Article.association_name_to_id_convert(params) clean_params = Ticket::Article.param_cleanup(clean_params, true) + # only apply preferences changes (keep not updated keys/values) + clean_params = article.param_preferences_merge(clean_params) + article.update!(clean_params) if response_expand? diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb index a38a5ce2337c..5d10c945c713 100644 --- a/app/controllers/tickets_controller.rb +++ b/app/controllers/tickets_controller.rb @@ -222,6 +222,9 @@ def update clean_params = Ticket.association_name_to_id_convert(params) clean_params = Ticket.param_cleanup(clean_params, true) + # only apply preferences changes (keep not updated keys/values) + clean_params = ticket.param_preferences_merge(clean_params) + # overwrite params if !current_user.permissions?('ticket.agent') %i[owner owner_id customer customer_id organization organization_id preferences].each do |key| @@ -445,6 +448,8 @@ def search condition: params[:condition].to_h, limit: per_page, offset: offset, + order_by: params[:order_by], + sort_by: params[:sort_by], current_user: current_user, ) diff --git a/app/controllers/time_accountings_controller.rb b/app/controllers/time_accountings_controller.rb index 0c581a854536..1ff3b7d82a05 100644 --- a/app/controllers/time_accountings_controller.rb +++ b/app/controllers/time_accountings_controller.rb @@ -46,7 +46,7 @@ def by_ticket end end end - if !customers[local_time_unit[:agent_id]] + if !agents[local_time_unit[:agent_id]] agent_user = User.lookup(id: local_time_unit[:agent_id]) agent = '-' if agent_user diff --git a/app/controllers/user_access_token_controller.rb b/app/controllers/user_access_token_controller.rb index f00227db7e6c..576a373bbbee 100644 --- a/app/controllers/user_access_token_controller.rb +++ b/app/controllers/user_access_token_controller.rb @@ -3,6 +3,29 @@ class UserAccessTokenController < ApplicationController prepend_before_action { authentication_check(permission: 'user_preferences.access_token') } +=begin + +Resource: +GET /api/v1/user_access_token + +Response: +{ + "tokens":[ + {"id":1,"label":"some user access token","preferences":{"permission":["cti.agent","ticket.agent"]},"last_used_at":null,"expires_at":null,"created_at":"2018-07-11T08:18:56.947Z"} + {"id":2,"label":"some user access token 2","preferences":{"permission":[ticket.agent"]},"last_used_at":null,"expires_at":null,"created_at":"2018-07-11T08:18:56.947Z"} + ], + "permissions":[ + {id: 1, name: "admin", note: "Admin Interface", preferences: {}, active: true,...}, + {id: 2, name: "admin.user", note: "Manage Users", preferences: {}, active: true,...}, + ... + ] +} + +Test: +curl http://localhost/api/v1/user_access_token -v -u #{login}:#{password} + +=end + def index tokens = Token.where(action: 'api', persistent: true, user_id: current_user.id).order('updated_at DESC, label ASC') token_list = [] @@ -41,6 +64,28 @@ def index }, status: :ok end +=begin + +Resource: +POST /api/v1/user_access_token + +Payload: +{ + "label":"some test", + "permission":["cti.agent","ticket.agent"], + "expires_at":null +} + +Response: +{ + "name":"new_token_only_shown_once" +} + +Test: +curl http://localhost/api/v1/user_access_token -v -u #{login}:#{password} -H "Content-Type: application/json" -X PUT -d '{"label":"some test","permission":["cti.agent","ticket.agent"],"expires_at":null}' + +=end + def create if Setting.get('api_token_access') == false raise Exceptions::UnprocessableEntity, 'API token access disabled!' @@ -63,6 +108,19 @@ def create }, status: :ok end +=begin + +Resource: +DELETE /api/v1/user_access_token/{id} + +Response: +{} + +Test: +curl http://localhost/api/v1/user_access_token/{id} -v -u #{login}:#{password} -H "Content-Type: application/json" -X DELETE + +=end + def destroy token = Token.find_by(action: 'api', user_id: current_user.id, id: params[:id]) raise Exceptions::UnprocessableEntity, 'Unable to find api token!' if !token diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 578e6f656832..e7c03202b24d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -405,6 +405,8 @@ def search query: query, limit: per_page, offset: offset, + sort_by: params[:sort_by], + order_by: params[:order_by], current_user: current_user, } %i[role_ids permissions].each do |key| @@ -474,67 +476,6 @@ def search render json: list, status: :ok end - # @path [GET] /users/recent - # - # @tag Search - # @tag User - # - # @summary Recent creates Users. - # @notes Recent creates Users. - # - # @parameter limit [Integer] The limit of search results. - # @parameter role_ids(multi) [Array] A list of Role identifiers to which the Users have to be allocated to. - # @parameter full [Boolean] Defines if the result should be - # true: { user_ids => [1,2,...], assets => {...} } - # or false: [{:id => user.id, :label => "firstname lastname ", :value => "firstname lastname "},...]. - # - # @response_message 200 [Array] A list of User records matching the search term. - # @response_message 401 Invalid session. - def recent - - if !current_user.permissions?('admin.user') - response_access_deny - return - end - - # do query - user_all = if params[:role_ids].present? - User.joins(:roles).where('roles.id' => params[:role_ids]).where('users.id != 1').order('users.created_at DESC').limit(params[:limit] || 20) - else - User.where('id != 1').order('created_at DESC').limit(params[:limit] || 20) - end - - # build result list - if !response_full? - users = [] - user_all.each do |user| - realname = user.firstname.to_s + ' ' + user.lastname.to_s - if user.email && user.email.to_s != '' - realname = realname + ' <' + user.email.to_s + '>' - end - a = { id: user.id, label: realname, value: realname } - users.push a - end - - # return result - render json: users - return - end - - user_ids = [] - assets = {} - user_all.each do |user| - assets = user.assets(assets) - user_ids.push user.id - end - - # return result - render json: { - assets: assets, - user_ids: user_ids.uniq, - } - end - # @path [GET] /users/history/{id} # # @tag History diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000000..d394c3d10623 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +class ApplicationJob < ActiveJob::Base + # Automatically retry jobs that encountered a deadlock + # retry_on ActiveRecord::Deadlocked + + # Most jobs are safe to ignore if the underlying records are no longer available + # discard_on ActiveJob::DeserializationError +end diff --git a/app/jobs/update_cti_logs_by_caller_job.rb b/app/jobs/update_cti_logs_by_caller_job.rb new file mode 100644 index 000000000000..a5adca6063b6 --- /dev/null +++ b/app/jobs/update_cti_logs_by_caller_job.rb @@ -0,0 +1,13 @@ +class UpdateCtiLogsByCallerJob < ApplicationJob + def perform(phone, limit: 60, offset: 0) + preferences = Cti::CallerId.get_comment_preferences(phone, 'from')&.last + + Cti::Log.where(from: phone, direction: 'in') + .order(created_at: :desc) + .limit(limit) + .offset(offset) + .each do |log| + log.update(preferences: preferences) + end + end +end diff --git a/app/models/application_model/can_cleanup_param.rb b/app/models/application_model/can_cleanup_param.rb index f31efd4b9bee..e9ded197764a 100644 --- a/app/models/application_model/can_cleanup_param.rb +++ b/app/models/application_model/can_cleanup_param.rb @@ -33,30 +33,30 @@ def param_cleanup(params, new_object = false) data = {} params.each do |key, value| - data[key.to_sym] = value + data[key.to_s] = value end # ignore id for new objects if new_object && params[:id] - data.delete(:id) + data.delete('id') end # only use object attributes - clean_params = {} + clean_params = ActiveSupport::HashWithIndifferentAccess.new new.attributes.each_key do |attribute| - next if !data.key?(attribute.to_sym) + next if !data.key?(attribute) # check reference records, referenced by _id attributes reflect_on_all_associations.map do |assoc| class_name = assoc.options[:class_name] next if !class_name - name = "#{assoc.name}_id".to_sym + name = "#{assoc.name}_id" next if !data.key?(name) next if data[name].blank? next if assoc.klass.lookup(id: data[name]) raise ArgumentError, "Invalid value for param '#{name}': #{data[name].inspect}" end - clean_params[attribute.to_sym] = data[attribute.to_sym] + clean_params[attribute] = data[attribute] end # we do want to set this via database @@ -89,5 +89,23 @@ def filter_unused_params(data) end data end + + end + +=begin + +merge preferences param + + record = Model.find(123) + + new_preferences = record.param_preferences_merge(param_preferences) + +=end + + def param_preferences_merge(new_params) + return new_params if new_params.blank? + return new_params if preferences.blank? + new_params[:preferences] = preferences.merge(new_params[:preferences] || {}) + new_params end end diff --git a/app/models/avatar.rb b/app/models/avatar.rb index c109cc931f19..dc7fd832d9e3 100644 --- a/app/models/avatar.rb +++ b/app/models/avatar.rb @@ -123,7 +123,7 @@ def self.add(data) data[:full][:content] = content data[:full][:mime_type] = mime_type - elsif data[:url].to_s.match?(/^http/) + elsif data[:url].to_s.match?(%r{^https?://}) url = data[:url].to_s # check if source ist already updated within last 2 minutes @@ -168,7 +168,7 @@ def self.add(data) data[:full][:mime_type] = mime_type # try zammad backend to find image based on email - elsif data[:url].to_s.match?(/@/) + elsif data[:url].to_s.match?(URI::MailTo::EMAIL_REGEXP) url = data[:url].to_s # check if source ist already updated within last 3 minutes @@ -179,9 +179,7 @@ def self.add(data) # fetch image image = Service::Image.user(url) return if !image - data[:resize] ||= {} data[:resize] = image - data[:full] ||= {} data[:full] = image end end diff --git a/app/models/channel/driver/sendmail.rb b/app/models/channel/driver/sendmail.rb index 9b040eb86b39..46cf13c8fc2f 100644 --- a/app/models/channel/driver/sendmail.rb +++ b/app/models/channel/driver/sendmail.rb @@ -6,6 +6,14 @@ def send(_options, attr, notification = false) # return if we run import mode return if Setting.get('import_mode') + # set system_bcc of config if defined + system_bcc = Setting.get('system_bcc') + if system_bcc.present? && system_bcc =~ /@/ + attr[:bcc] ||= '' + attr[:bcc] += ', ' if attr[:bcc].present? + attr[:bcc] += system_bcc + end + mail = Channel::EmailBuild.build(attr, notification) mail.delivery_method delivery_method mail.deliver diff --git a/app/models/channel/driver/smtp.rb b/app/models/channel/driver/smtp.rb index 27beb797d859..ffc872c1772d 100644 --- a/app/models/channel/driver/smtp.rb +++ b/app/models/channel/driver/smtp.rb @@ -52,6 +52,15 @@ def send(options, attr, notification = false) if !options.key?(:openssl_verify_mode) options[:openssl_verify_mode] = 'none' end + + # set system_bcc of config if defined + system_bcc = Setting.get('system_bcc') + if system_bcc.present? && system_bcc =~ /@/ + attr[:bcc] ||= '' + attr[:bcc] += ', ' if attr[:bcc].present? + attr[:bcc] += system_bcc + end + mail = Channel::EmailBuild.build(attr, notification) smtp_params = { openssl_verify_mode: options[:openssl_verify_mode], diff --git a/app/models/channel/email_parser.rb b/app/models/channel/email_parser.rb index 4b5d10bf224f..049f5fb02baa 100644 --- a/app/models/channel/email_parser.rb +++ b/app/models/channel/email_parser.rb @@ -70,15 +70,16 @@ class Channel::EmailParser =end def parse(msg) - mail = Mail.new(msg.utf8_encode) + mail = Mail.new(msg.force_encoding('binary')) + headers = message_header_hash(mail) + body = message_body_hash(mail) message_attributes = [ { mail_instance: mail }, - message_header_hash(mail), - message_body_hash(mail), - self.class.sender_attributes(mail), + headers, + body, + self.class.sender_attributes(headers), ] - message_attributes.reduce({}.with_indifferent_access, &:merge) end @@ -340,8 +341,8 @@ def self.check_attributes_by_x_headers(header_name, value) end def self.sender_attributes(from) - if from.is_a?(Mail::Message) - from = SENDER_FIELDS.map { |f| from.header[f] }.compact + if from.is_a?(HashWithIndifferentAccess) + from = SENDER_FIELDS.map { |f| from[f] }.compact .map(&:to_utf8).reject(&:blank?) .partition { |address| address.match?(EMAIL_REGEX) } .flatten.first @@ -365,7 +366,7 @@ def self.sender_attributes(from) data[:from_local] = mail_address.local data[:from_domain] = mail_address.domain data[:from_display_name] = mail_address.display_name || mail_address.comments&.first - elsif from =~ /^(.+?)<((.+?)@(.+?))>$/ + elsif from =~ /^(.+?)<((.+?)@(.+?))>/ data[:from_email] = $2 data[:from_local] = $3 data[:from_domain] = $4 @@ -476,26 +477,31 @@ def self.process_unprocessable_mails(params = {}) def message_header_hash(mail) imported_fields = mail.header.fields.map do |f| - value = begin - f.to_utf8 - rescue NameError # handle bug #1238 in Mail 2.7.1.rc1 - '' # swap out for commented line below once upgrade is available - end - + begin + value = f.to_utf8 + if value.blank? + value = f.raw_value.to_utf8 + end + rescue + value = f.raw_value.to_utf8(fallback: :read_as_sanitized_binary) + end [f.name.downcase, value] end.to_h # imported_fields = mail.header.fields.map { |f| [f.name.downcase, f.to_utf8] }.to_h raw_fields = mail.header.fields.map { |f| ["raw-#{f.name.downcase}", f] }.to_h custom_fields = {}.tap do |h| - validated_recipients = imported_fields.slice(*RECIPIENT_FIELDS) - .transform_values { |v| v.match?(EMAIL_REGEX) ? v : '' } - h.merge!(validated_recipients) + h.replace(imported_fields.slice(*RECIPIENT_FIELDS) + .transform_values { |v| v.match?(EMAIL_REGEX) ? v : '' }) - h['date'] = Time.zone.parse(mail.date.to_s) || imported_fields['date'] + h['x-any-recipient'] = h.values.select(&:present?).join(', ') h['message_id'] = imported_fields['message-id'] - h['subject'] = imported_fields['subject']&.sub(/^=\?us-ascii\?Q\?(.+)\?=$/, '\1') - h['x-any-recipient'] = validated_recipients.values.select(&:present?).join(', ') + h['subject'] = imported_fields['subject']&.sub(/^=\?us-ascii\?Q\?(.+)\s*\?=\s*$/, '\1') + begin + h['date'] = Time.zone.parse(mail.date.to_s) || imported_fields['date'] + rescue + h['date'] = nil + end end [imported_fields, raw_fields, custom_fields].reduce({}.with_indifferent_access, &:merge) @@ -570,7 +576,7 @@ def collect_attachments(mail) def get_attachments(file, attachments, mail) return file.parts.map { |p| get_attachments(p, attachments, mail) } if file.parts.any? - return [] if [mail.text_part, mail.html_part].include?(file) + return [] if [mail.text_part&.body&.encoded, mail.html_part&.body&.encoded].include?(file.body.encoded) # get file preferences headers_store = {} @@ -597,15 +603,29 @@ def get_attachments(file, attachments, mail) # get filename from content-disposition # workaround for: NoMethodError: undefined method `filename' for # - filename = file.header[:content_disposition].try(:filename) + begin + filename = file.header[:content_disposition].try(:filename) + rescue + begin + if file.header[:content_disposition].to_s =~ /(filename|name)(\*{0,1})="(.+?)"/i + filename = $3 + elsif file.header[:content_disposition].to_s =~ /(filename|name)(\*{0,1})='(.+?)'/i + filename = $3 + elsif file.header[:content_disposition].to_s =~ /(filename|name)(\*{0,1})=(.+?);/i + filename = $3 + end + rescue + Rails.logger.debug { 'Unable to get filename' } + end + end begin - if file.header[:content_disposition].to_s =~ /filename="(.+?)"/i - filename = $1 - elsif file.header[:content_disposition].to_s =~ /filename='(.+?)'/i - filename = $1 - elsif file.header[:content_disposition].to_s =~ /filename=(.+?);/i - filename = $1 + if file.header[:content_disposition].to_s =~ /(filename|name)(\*{0,1})="(.+?)"/i + filename = $3 + elsif file.header[:content_disposition].to_s =~ /(filename|name)(\*{0,1})='(.+?)'/i + filename = $3 + elsif file.header[:content_disposition].to_s =~ /(filename|name)(\*{0,1})=(.+?);/i + filename = $3 end rescue Rails.logger.debug { 'Unable to get filename' } @@ -613,12 +633,12 @@ def get_attachments(file, attachments, mail) # as fallback, use raw values if filename.blank? - if headers_store['Content-Disposition'].to_s =~ /filename="(.+?)"/i - filename = $1 - elsif headers_store['Content-Disposition'].to_s =~ /filename='(.+?)'/i - filename = $1 - elsif headers_store['Content-Disposition'].to_s =~ /filename=(.+?);/i - filename = $1 + if headers_store['Content-Disposition'].to_s =~ /(filename|name)(\*{0,1})="(.+?)"/i + filename = $3 + elsif headers_store['Content-Disposition'].to_s =~ /(filename|name)(\*{0,1})='(.+?)'/i + filename = $3 + elsif headers_store['Content-Disposition'].to_s =~ /(filename|name)(\*{0,1})=(.+?);/i + filename = $3 end end @@ -652,9 +672,9 @@ def get_attachments(file, attachments, mail) # e. g. Content-Type: video/quicktime; name="Video.MOV"; if filename.blank? - ['name="(.+?)"(;|$)', "name='(.+?)'(;|$)", 'name=(.+?)(;|$)'].each do |regexp| + ['(filename|name)(\*{0,1})="(.+?)"(;|$)', '(filename|name)(\*{0,1})=\'(.+?)\'(;|$)', '(filename|name)(\*{0,1})=(.+?)(;|$)'].each do |regexp| if headers_store['Content-Type'] =~ /#{regexp}/i - filename = $1 + filename = $3 break end end @@ -743,7 +763,11 @@ module Mail # workaround to get content of no parseable headers - in most cases with non 7 bit ascii signs class Field def raw_value - value = @raw_value.try(:utf8_encode) + begin + value = @raw_value.try(:utf8_encode) + rescue + value = @raw_value.utf8_encode(fallback: :read_as_sanitized_binary) + end return value if value.blank? value.sub(/^.+?:(\s|)/, '') end @@ -784,4 +808,19 @@ def self.value_decode(str) end.join('') end end + + # issue#348 - IMAP mail fetching stops because of broken spam email (e. g. broken Content-Transfer-Encoding value see test/fixtures/mail43.box) + # https://github.com/zammad/zammad/issues/348 + class Body + def decoded + if !Encodings.defined?(encoding) + #raise UnknownEncodingType, "Don't know how to decode #{encoding}, please call #encoded and decode it yourself." + Rails.logger.info "UnknownEncodingType: Don't know how to decode #{encoding}!" + raw_source + else + Encodings.get_encoding(encoding).decode(raw_source) + end + end + end + end diff --git a/app/models/channel/filter/bounce_delivery_temporary_failed.rb b/app/models/channel/filter/bounce_delivery_temporary_failed.rb new file mode 100644 index 000000000000..9d07b6cb40a8 --- /dev/null +++ b/app/models/channel/filter/bounce_delivery_temporary_failed.rb @@ -0,0 +1,17 @@ +# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/ + +module Channel::Filter::BounceDeliveryTemporaryFailed + + def self.run(_channel, mail) + return if !mail[:mail_instance] + return if !mail[:attachments] + return if mail[:mail_instance].action != 'delayed' + return if mail[:mail_instance].retryable? != true + return if mail[:mail_instance].error_status != '4.4.1' + + # if header is available, do change current ticket state + mail['x-zammad-out-of-office'.to_sym] = true + + true + end +end diff --git a/app/models/channel/filter/identify_sender.rb b/app/models/channel/filter/identify_sender.rb index 5b8984046e00..ddc72bedf3c2 100644 --- a/app/models/channel/filter/identify_sender.rb +++ b/app/models/channel/filter/identify_sender.rb @@ -143,55 +143,57 @@ def self.create_recipients(mail) end end - def self.user_create(data, role_ids = nil) - data[:email] += '@local' if !data[:email].match?(/@/) - user = User.find_by(email: data[:email].downcase) || - User.find_by(login: data[:email].downcase) - - # check if firstname or lastname need to be updated - if user - if user.firstname.blank? && user.lastname.blank? - if data[:firstname].present? - data[:firstname] = cleanup_name(data[:firstname]) - user.update!( - firstname: data[:firstname] - ) - end - end - return user + def self.user_create(attrs, role_ids = nil) + populate_attributes!(attrs, role_ids: role_ids) + + if (user = User.find_by('email = :email OR login = :email', attrs)) + user.update!(attrs.slice(:firstname)) if user.no_name? && attrs[:firstname].present? + elsif (user = User.create!(attrs)) + user.update!(updated_by_id: user.id, created_by_id: user.id) end - # create new user - role_ids ||= Role.signup_role_ids + user + end - # fillup - %w[firstname lastname].each do |item| - if data[item.to_sym].nil? - data[item.to_sym] = '' - end - data[item.to_sym] = cleanup_name(data[item.to_sym]) + def self.populate_attributes!(attrs, **extras) + if attrs[:email].match?(/\S\s+\S/) || attrs[:email].match?(/^<|>$/) + attrs[:preferences] = { mail_delivery_failed: true, + mail_delivery_failed_reason: 'invalid email', + mail_delivery_failed_data: Time.zone.now } end - data[:password] = '' - data[:active] = true - data[:role_ids] = role_ids - data[:updated_by_id] = 1 - data[:created_by_id] = 1 - - user = User.create!(data) - user.update!( - updated_by_id: user.id, - created_by_id: user.id, + + attrs.merge!( + email: sanitize_email(attrs[:email]), + firstname: sanitize_name(attrs[:firstname]), + lastname: sanitize_name(attrs[:lastname]), + password: '', + active: true, + role_ids: extras[:role_ids] || Role.signup_role_ids, + updated_by_id: 1, + created_by_id: 1 ) - user end - def self.cleanup_name(string) - string.strip! - string.delete!('"') - string.gsub!(/^'/, '') - string.gsub!(/'$/, '') - string.gsub!(/.+?\s\(.+?\)$/, '') - string + def self.sanitize_name(string) + return '' if string.nil? + + string.strip + .delete('"') + .gsub(/^'/, '') + .gsub(/'$/, '') + .gsub(/.+?\s\(.+?\)$/, '') + end + + def self.sanitize_email(string) + string += '@local' if !string.include?('@') + + string.downcase + .strip + .delete('"') + .delete(' ') # see https://github.com/zammad/zammad/issues/2254 + .sub(/^<|>$/, '') # see https://github.com/zammad/zammad/issues/2254 + .sub(/\A'(.*)'\z/, '\1') # see https://github.com/zammad/zammad/issues/2154 + .gsub(/\s/, '') # see https://github.com/zammad/zammad/issues/2198 end end diff --git a/app/models/channel/filter/monitoring_base.rb b/app/models/channel/filter/monitoring_base.rb index 1c7dd74ee8dd..17c8db2260cc 100644 --- a/app/models/channel/filter/monitoring_base.rb +++ b/app/models/channel/filter/monitoring_base.rb @@ -30,7 +30,8 @@ def self.run(_channel, mail) # get mail attibutes like host and state result = {} - mail[:body].gsub(%r{(Service|Host|State|Address|Date/Time|Additional\sInfo|Info|Action|Description):(.+?)\n}i) do |_match| + + mail[:body].gsub(%r{(Service|Host|State|Address|Date/Time|Additional\sInfo|Info|Action|Description):(.+?)(\n|$)}i) do |_match| key = $1 if key key = key.downcase diff --git a/app/models/concerns/has_search_sortable.rb b/app/models/concerns/has_search_sortable.rb new file mode 100644 index 000000000000..a1e60be6d20b --- /dev/null +++ b/app/models/concerns/has_search_sortable.rb @@ -0,0 +1,157 @@ +# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/ +module HasSearchSortable + extend ActiveSupport::Concern + + # methods defined here are going to extend the class, not the instance of it + class_methods do + +=begin + +This function will check the params for the "sort_by" attribute +and validate its values. + + sort_by = search_get_sort_by(params, default) + +returns + + sort_by = [ + 'created_at', + 'updated_at', + ] + +=end + + def search_get_sort_by(params, default) + sort_by = [] + if params[:sort_by].present? && params[:sort_by].is_a?(String) + params[:sort_by] = [params[:sort_by]] + elsif params[:sort_by].blank? + params[:sort_by] = [] + end + + # check order + params[:sort_by].each do |value| + + # only accept values which are set for the db schema + raise "Found invalid column '#{value}' for sorting." if columns_hash[value].blank? + + sort_by.push(value) + end + + if sort_by.blank? + sort_by.push(default) + end + + sort_by + end + +=begin + +This function will check the params for the "order_by" attribute +and validate its values. + + order_by = search_get_order_by(params, default) + +returns + + order_by = [ + 'asc', + 'desc', + ] + +=end + + def search_get_order_by(params, default) + order_by = [] + if params[:order_by].present? && params[:order_by].is_a?(String) + params[:order_by] = [ params[:order_by] ] + elsif params[:order_by].blank? + params[:order_by] = [] + end + + # check order + params[:order_by].each do |value| + raise "Found invalid order by value #{value}. Please use 'asc' or 'desc'." if value !~ /\A(asc|desc)\z/i + order_by.push(value.downcase) + end + + if order_by.blank? + order_by.push(default) + end + + order_by + end + +=begin + +This function will use the evaluated values for sort_by and +order_by to generate the ORDER-SELECT sql statement for the sorting +of the result. + + sort_by = [ 'created_at', 'updated_at' ] + order_by = [ 'asc', 'desc' ] + default = 'tickets.created_at' + + sql = search_get_order_select_sql(sort_by, order_by, default) + +returns + + sql = 'tickets.created_at, tickets.updated_at' + +=end + + def search_get_order_select_sql(sort_by, order_by, default) + sql = [] + + sort_by.each_with_index do |value, index| + next if value.blank? + next if order_by[index].blank? + + sql.push( "#{ActiveRecord::Base.connection.quote_table_name(table_name)}.#{ActiveRecord::Base.connection.quote_column_name(value)}" ) + end + + if sql.blank? + sql.push("#{ActiveRecord::Base.connection.quote_table_name(table_name)}.#{ActiveRecord::Base.connection.quote_column_name(default)}") + end + + sql.join(', ') + end + +=begin + +This function will use the evaluated values for sort_by and +order_by to generate the ORDER- sql statement for the sorting +of the result. + + sort_by = [ 'created_at', 'updated_at' ] + order_by = [ 'asc', 'desc' ] + default = 'tickets.created_at DESC' + + sql = search_get_order_sql(sort_by, order_by, default) + +returns + + sql = 'tickets.created_at ASC, tickets.updated_at DESC' + +=end + + def search_get_order_sql(sort_by, order_by, default) + sql = [] + + sort_by.each_with_index do |value, index| + next if value.blank? + next if order_by[index].blank? + + sql.push( "#{ActiveRecord::Base.connection.quote_table_name(table_name)}.#{ActiveRecord::Base.connection.quote_column_name(value)} #{order_by[index]}" ) + end + + if sql.blank? + sql.push("#{ActiveRecord::Base.connection.quote_table_name(table_name)}.#{ActiveRecord::Base.connection.quote_column_name(default)}") + end + + sql.join(', ') + end + + end + +end diff --git a/app/models/cti/caller_id.rb b/app/models/cti/caller_id.rb index caf7beea6533..f531f83af0c4 100644 --- a/app/models/cti/caller_id.rb +++ b/app/models/cti/caller_id.rb @@ -4,6 +4,11 @@ class CallerId < ApplicationModel DEFAULT_COUNTRY_ID = '49'.freeze + # adopt/orphan matching Cti::Log records + # (see https://github.com/zammad/zammad/issues/2057) + after_commit :update_cti_logs, on: :destroy + after_commit :update_cti_logs_with_fg_optimization, on: :create + =begin Cti::CallerId.maybe_add( @@ -42,25 +47,17 @@ def self.maybe_add(data) =end def self.lookup(caller_id) - - result = [] - ['known', 'maybe', nil].each do |level| - - search_params = { - caller_id: caller_id, - } - - if level - search_params[:level] = level - end - - caller_ids = Cti::CallerId.select('MAX(id) as caller_id').where(search_params).group(:user_id).order('caller_id DESC').limit(20).map(&:caller_id) - Cti::CallerId.where(id: caller_ids).order(id: :desc).each do |record| - result.push record - end - break if result.present? - end - result + lookup_ids = + ['known', 'maybe', nil].lazy.map do |level| + Cti::CallerId.select('MAX(id) as caller_id') + .where({ caller_id: caller_id, level: level }.compact) + .group(:user_id) + .order('caller_id DESC') + .limit(20) + .map(&:caller_id) + end.find(&:present?) + + Cti::CallerId.where(id: lookup_ids).order(id: :desc).to_a end =begin @@ -101,6 +98,10 @@ def self.build_item(record, model, level) # set user id user_id = record[:created_by_id] if model == User + if record.destroyed? + Cti::CallerId.where(user_id: user_id).destroy_all + return + end user_id = record.id end return if !user_id @@ -116,9 +117,31 @@ def self.build_item(record, model, level) caller_ids = caller_ids.concat(local_caller_ids) end - # store caller ids - Cti::CallerId.where(object: model.to_s, o_id: record.id).destroy_all - caller_ids.each do |caller_id| + # search for caller ids to keep + caller_ids_to_add = [] + existing_record_ids = Cti::CallerId.where(object: model.to_s, o_id: record.id).pluck(:id) + caller_ids.uniq.each do |caller_id| + existing_record_id = Cti::CallerId.where( + object: model.to_s, + o_id: record.id, + caller_id: caller_id, + level: level, + user_id: user_id, + ).pluck(:id) + if existing_record_id[0] + existing_record_ids.delete(existing_record_id[0]) + next + end + caller_ids_to_add.push caller_id + end + + # delete not longer existing caller ids + existing_record_ids.each do |record_id| + Cti::CallerId.destroy(record_id) + end + + # create new caller ids + caller_ids_to_add.each do |caller_id| Cti::CallerId.maybe_add( caller_id: caller_id, level: level, @@ -253,5 +276,16 @@ def self.get_comment_preferences(caller_id, direction) nil end + def update_cti_logs + return if object != 'User' + UpdateCtiLogsByCallerJob.perform_later(caller_id) + end + + def update_cti_logs_with_fg_optimization + return if object != 'User' + return if level != 'known' + UpdateCtiLogsByCallerJob.perform_now(caller_id, limit: 20) + UpdateCtiLogsByCallerJob.perform_later(caller_id, limit: 40, offset: 20) + end end end diff --git a/app/models/cti/log.rb b/app/models/cti/log.rb index edb99b8d4751..a86af3c7f389 100644 --- a/app/models/cti/log.rb +++ b/app/models/cti/log.rb @@ -4,13 +4,13 @@ class Log < ApplicationModel store :preferences - after_create :push_event, :push_caller_list - after_update :push_event, :push_caller_list - after_destroy :push_event, :push_caller_list + validates :state, format: { with: /\A(newCall|answer|hangup)\z/,  message: 'newCall|answer|hangup is allowed' } + + after_commit :push_incoming_call, :push_caller_list_update =begin - Cti::Log.create( + Cti::Log.create!( direction: 'in', from: '007', from_comment: 'AAA', @@ -21,7 +21,7 @@ class Log < ApplicationModel state: 'newCall', ) - Cti::Log.create( + Cti::Log.create!( direction: 'in', from: '007', from_comment: '', @@ -32,7 +32,7 @@ class Log < ApplicationModel state: 'answer', ) - Cti::Log.create( + Cti::Log.create!( direction: 'in', from: '009', from_comment: '', @@ -45,13 +45,13 @@ class Log < ApplicationModel example data, can be used for demo - Cti::Log.create( + Cti::Log.create!( direction: 'in', from: '4930609854180', from_comment: 'Franz Bauer', to: '4930609811111', to_comment: 'Bob Smith', - call_id: '00001', + call_id: '435452113', comment: '', state: 'newCall', done: false, @@ -69,13 +69,13 @@ class Log < ApplicationModel } ) - Cti::Log.create( + Cti::Log.create!( direction: 'out', from: '4930609854180', from_comment: 'Franz Bauer', to: '4930609811111', to_comment: 'Bob Smith', - call_id: '00002', + call_id: rand(999_999_999), comment: '', state: 'newCall', preferences: { @@ -92,13 +92,13 @@ class Log < ApplicationModel } ) - Cti::Log.create( + Cti::Log.create!( direction: 'in', from: '4930609854180', from_comment: 'Franz Bauer', to: '4930609811111', to_comment: 'Bob Smith', - call_id: '00003', + call_id: rand(999_999_999), comment: '', state: 'answer', preferences: { @@ -115,13 +115,13 @@ class Log < ApplicationModel } ) - Cti::Log.create( + Cti::Log.create!( direction: 'in', from: '4930609854180', from_comment: 'Franz Bauer', to: '4930609811111', to_comment: 'Bob Smith', - call_id: '00004', + call_id: rand(999_999_999), comment: '', state: 'hangup', comment: 'normalClearing', @@ -140,17 +140,17 @@ class Log < ApplicationModel } ) - Cti::Log.create( + Cti::Log.create!( direction: 'in', from: '4930609854180', from_comment: 'Franz Bauer', to: '4930609811111', to_comment: 'Bob Smith', - call_id: '00005', + call_id: rand(999_999_999), comment: '', state: 'hangup', - start: Time.zone.now - 15.seconds, - 'end': Time.zone.now, + start_at: Time.zone.now - 15.seconds, + end_at: Time.zone.now, preferences: { from: [ { @@ -165,17 +165,17 @@ class Log < ApplicationModel } ) - Cti::Log.create( + Cti::Log.create!( direction: 'in', from: '4930609854180', from_comment: 'Franz Bauer', to: '4930609811111', to_comment: '', - call_id: '00006', + call_id: rand(999_999_999), comment: '', state: 'hangup', - start: Time.zone.now - 15.seconds, - 'end': Time.zone.now, + start_at: Time.zone.now - 15.seconds, + end_at: Time.zone.now, preferences: { from: [ { @@ -190,17 +190,17 @@ class Log < ApplicationModel } ) - Cti::Log.create( + Cti::Log.create!( direction: 'in', from: '4930609854180', from_comment: 'Franz Bauer', to: '4930609811111', to_comment: 'Bob Smith', - call_id: '00007', + call_id: rand(999_999_999), comment: '', state: 'hangup', - start: Time.zone.now - 15.seconds, - 'end': Time.zone.now, + start_at: Time.zone.now - 15.seconds, + end_at: Time.zone.now, preferences: { from: [ { @@ -215,15 +215,15 @@ class Log < ApplicationModel } ) - Cti::Log.create( + Cti::Log.create!( direction: 'in', from: '4930609854180', to: '4930609811112', - call_id: '00008', + call_id: rand(999_999_999), comment: '', state: 'hangup', - start: Time.zone.now - 20.seconds, - 'end': Time.zone.now, + start_at: Time.zone.now - 20.seconds, + end_at: Time.zone.now, preferences: {} ) @@ -236,14 +236,14 @@ class Log < ApplicationModel returns { - list: [...] - assets: {...} + list: [log_record1, log_record2, log_record3], + assets: {...}, } =end def self.log - list = Cti::Log.order('created_at DESC, id DESC').limit(60) + list = Cti::Log.log_records # add assets assets = list.map(&:preferences) @@ -259,6 +259,20 @@ def self.log } end +=begin + + Cti::Log.log_records + +returns + + [log_record1, log_record2, log_record3] + +=end + + def self.log_records + Cti::Log.order('created_at DESC, id DESC').limit(60) + end + =begin processes a incoming event @@ -269,14 +283,14 @@ def self.log 'user' => 'user 1', 'from' => '4912347114711', 'to' => '4930600000000', - 'callId' => '4991155921769858278-1', # or call_id + 'callId' => '43545211', # or call_id 'direction' => 'in', ) =end def self.process(params) - comment = params['cause'] + cause = params['cause'] event = params['event'] user = params['user'] call_id = params['callId'] || params['call_id'] @@ -287,6 +301,7 @@ def self.process(params) from_comment = nil to_comment = nil preferences = nil + done = true if params['direction'] == 'in' to_comment = user from_comment, preferences = CallerId.get_comment_preferences(params['from'], 'from') @@ -295,8 +310,14 @@ def self.process(params) to_comment, preferences = CallerId.get_comment_preferences(params['to'], 'to') end + log = find_by(call_id: call_id) + case event when 'newCall' + if params['direction'] == 'in' + done = false + end + raise "call_id #{call_id} already exists!" if log create( direction: params['direction'], from: params['from'], @@ -304,43 +325,60 @@ def self.process(params) to: params['to'], to_comment: to_comment, call_id: call_id, - comment: comment, + comment: cause, state: event, + initialized_at: Time.zone.now, preferences: preferences, + done: done, ) when 'answer' - log = find_by(call_id: call_id) raise "No such call_id #{call_id}" if !log - log.state = 'answer' - log.start = Time.zone.now - if user - log.to_comment = user + return if log.state == 'hangup' # call is already hangup, ignore answer + log.with_lock do + log.state = 'answer' + log.start_at = Time.zone.now + log.duration_waiting_time = log.start_at.to_i - log.initialized_at.to_i + if user + log.to_comment = user + end + log.done = true + log.comment = cause + log.save end - log.comment = comment - log.save when 'hangup' - log = find_by(call_id: call_id) raise "No such call_id #{call_id}" if !log - if params['direction'] == 'in' && log.state == 'newCall' - log.done = false - end - if params['direction'] == 'in' && log.to_comment == 'voicemail' - log.done = false + log.with_lock do + log.done = done + if params['direction'] == 'in' + if log.state == 'newCall' && cause != 'forwarded' + log.done = false + elsif log.to_comment == 'voicemail' + log.done = false + end + end + log.state = 'hangup' + log.end_at = Time.zone.now + if log.start_at + log.duration_talking_time = log.start_at.to_i - log.end_at.to_i + elsif !log.duration_waiting_time && log.initialized_at + log.duration_waiting_time = log.end_at.to_i - log.initialized_at.to_i + end + log.comment = cause + log.save end - log.state = 'hangup' - log.end = Time.zone.now - log.comment = comment - log.save else raise ArgumentError, "Unknown event #{event.inspect}" end end - def push_event + def push_incoming_call + return true if destroyed? + return true if state != 'newCall' + return true if direction != 'in' + + # send notify about event users = User.with_permissions('cti.agent') users.each do |user| - - # send notify about event Sessions.send_to( user.id, { @@ -349,23 +387,29 @@ def push_event }, ) end + true + end + + def self.push_caller_list_update?(record) + list_ids = Cti::Log.log_records.pluck(:id) + return true if list_ids.include?(record.id) + false end - def push_caller_list - list = Cti::Log.log + def push_caller_list_update + return false if !Cti::Log.push_caller_list_update?(self) + # send notify on create/update/delete users = User.with_permissions('cti.agent') users.each do |user| - - # send notify on create/update/delete Sessions.send_to( user.id, { event: 'cti_list_push', - data: list, }, ) end + true end =begin diff --git a/app/models/http_log.rb b/app/models/http_log.rb index 26474c81232d..51f29687e898 100644 --- a/app/models/http_log.rb +++ b/app/models/http_log.rb @@ -4,6 +4,9 @@ class HttpLog < ApplicationModel store :request store :response + # See https://github.com/zammad/zammad/issues/2100 + before_save :messages_to_utf8 + =begin cleanup old http logs @@ -21,4 +24,10 @@ def self.cleanup(diff = 1.month) true end + private + + def messages_to_utf8 + request.transform_values! { |v| v.try(:utf8_encode) || v } + response.transform_values! { |v| v.try(:utf8_encode) || v } + end end diff --git a/app/models/job.rb b/app/models/job.rb index 45556f116fad..10a8778a76ea 100644 --- a/app/models/job.rb +++ b/app/models/job.rb @@ -24,8 +24,9 @@ class Job < ApplicationModel def self.run start_at = Time.zone.now - jobs = Job.where(active: true, running: false) + jobs = Job.where(active: true) jobs.each do |job| + next if !job.executable? job.run(false, start_at) end true @@ -75,6 +76,7 @@ def run(force = false, start_at = Time.zone.now) self.processed = ticket_count || 0 self.running = true + self.last_run_at = Time.zone.now save! tickets&.each do |ticket| @@ -94,6 +96,9 @@ def executable?(start_at = Time.zone.now) # only execute jobs, older then 1 min, to give admin posibility to change return false if updated_at > Time.zone.now - 1.minute + # check if job got stuck + return false if running == true && last_run_at && Time.zone.now - 1.day < last_run_at + # check if jobs need to be executed # ignore if job was running within last 10 min. return false if last_run_at && last_run_at > start_at - 10.minutes diff --git a/app/models/object_manager/attribute.rb b/app/models/object_manager/attribute.rb index 0a4bcfc1c31c..6d626936a848 100644 --- a/app/models/object_manager/attribute.rb +++ b/app/models/object_manager/attribute.rb @@ -2,18 +2,40 @@ class ObjectManager::Attribute < ApplicationModel include ChecksClientNotification include CanSeed + DATA_TYPES = %w[ + input + user_autocompletion + checkbox + select + tree_select + datetime + date + tag + richtext + textarea + integer + autocompletion_ajax + boolean + user_permission + active + select_organization + autocompletion_multiple_ajax + ].freeze + self.table_name = 'object_manager_attributes' belongs_to :object_lookup validates :name, presence: true + validates :data_type, inclusion: { in: DATA_TYPES, msg: '%{value} is not a valid data type' } + validate :data_option_must_have_appropriate_values + validate :data_type_must_not_change, on: :update store :screens store :data_option store :data_option_new - before_create :check_datatype - before_update :check_datatype, :verify_possible_type_change + before_validation :set_base_options =begin @@ -621,6 +643,12 @@ def self.migration_execute(send_event = true) # config changes if attribute.to_config execute_config_count += 1 + if attribute.data_type == 'select' && attribute.data_option[:options] + historical_options = attribute.data_option[:historical_options] || {} + historical_options.update(attribute.data_option[:options]) + historical_options.update(attribute.data_option_new[:options]) + attribute.data_option_new[:historical_options] = historical_options + end attribute.data_option = attribute.data_option_new attribute.data_option_new = {} attribute.to_config = false @@ -628,6 +656,10 @@ def self.migration_execute(send_event = true) next if !attribute.to_create && !attribute.to_migrate && !attribute.to_delete end + if attribute.data_type == 'select' && attribute.data_option[:options] + attribute.data_option[:historical_options] = attribute.data_option[:options] + end + data_type = nil if attribute.data_type.match?(/^input|select|tree_select|richtext|textarea|checkbox$/) data_type = :string @@ -868,8 +900,16 @@ def check_name reserved_words = %w[destroy true false integer select drop create alter index table varchar blob date datetime timestamp] raise "#{name} is a reserved word, please choose a different one" if name.match?(/^(#{reserved_words.join('|')})$/) + # fixes issue #2236 - Naming an attribute "attribute" causes ActiveRecord failure + begin + ObjectLookup.by_id(object_lookup_id).constantize.instance_method_already_implemented? name + rescue ActiveRecord::DangerousAttributeError => e + raise "#{name} is a reserved word, please choose a different one" + end + record = object_lookup.name.constantize.new return true if !record.respond_to?(name.to_sym) + raise "#{name} already exists!" if record.attributes.key?(name) && new_record? return true if record.attributes.key?(name) raise "#{name} is a reserved word, please choose a different one" end @@ -881,88 +921,87 @@ def check_editable private - def check_datatype - local_data_option = data_option - if to_config == true - local_data_option = data_option_new - end - if !data_type - raise 'Need data_type param' - end - if !data_type.match?(/^(input|user_autocompletion|checkbox|select|tree_select|datetime|date|tag|richtext|textarea|integer|autocompletion_ajax|boolean|user_permission|active)$/) - raise "Invalid data_type param '#{data_type}'" - end - - if local_data_option.blank? - raise 'Need data_option param' - end - if local_data_option[:null].nil? - raise 'Need data_option[:null] param with true or false' - end - - # validate data_option - if data_type == 'input' - raise 'Need data_option[:type] param e. g. (text|password|tel|fax|email|url)' if !local_data_option[:type] - raise "Invalid data_option[:type] param '#{local_data_option[:type]}' (text|password|tel|fax|email|url)" if local_data_option[:type] !~ /^(text|password|tel|fax|email|url)$/ - raise 'Need data_option[:maxlength] param' if !local_data_option[:maxlength] - raise "Invalid data_option[:maxlength] param #{local_data_option[:maxlength]}" if local_data_option[:maxlength].to_s !~ /^\d+?$/ - end - - if data_type == 'richtext' - raise 'Need data_option[:maxlength] param' if !local_data_option[:maxlength] - raise "Invalid data_option[:maxlength] param #{local_data_option[:maxlength]}" if local_data_option[:maxlength].to_s !~ /^\d+?$/ - end - - if data_type == 'integer' - %i[min max].each do |item| - raise "Need data_option[#{item.inspect}] param" if !local_data_option[item] - raise "Invalid data_option[#{item.inspect}] param #{data_option[item]}" if local_data_option[item].to_s !~ /^\d+?$/ - end - end + # when setting default values for boolean fields, + # favor #nil? tests over ||= (which will overwrite `false`) + def set_base_options + local_data_option[:null] = true if local_data_option[:null].nil? - if data_type == 'select' || data_type == 'tree_select' || data_type == 'checkbox' - raise 'Need data_option[:default] param' if !local_data_option.key?(:default) - raise 'Invalid data_option[:options] or data_option[:relation] param' if local_data_option[:options].nil? && local_data_option[:relation].nil? - if !local_data_option.key?(:maxlength) - local_data_option[:maxlength] = 255 - end - if !local_data_option.key?(:nulloption) - local_data_option[:nulloption] = true - end + case data_type + when /^((tree_)?select|checkbox)$/ + local_data_option[:nulloption] = true if local_data_option[:nulloption].nil? + local_data_option[:maxlength] ||= 255 end + end - if data_type == 'boolean' - raise 'Need data_option[:default] param true|false|undefined' if !local_data_option.key?(:default) - raise 'Invalid data_option[:options] param' if local_data_option[:options].nil? - end + def data_option_must_have_appropriate_values + data_option_validations + .select { |validation| validation[:failed] } + .each { |validation| errors.add(local_data_attr, validation[:message]) } + end - if data_type == 'datetime' - raise 'Need data_option[:future] param true|false' if local_data_option[:future].nil? - raise 'Need data_option[:past] param true|false' if local_data_option[:past].nil? - raise 'Need data_option[:diff] param in hours' if local_data_option[:diff].nil? - end + def data_type_must_not_change + allowable_changes = %w[tree_select select input checkbox] - if data_type == 'date' - raise 'Need data_option[:future] param true|false' if local_data_option[:future].nil? - raise 'Need data_option[:past] param true|false' if local_data_option[:past].nil? - raise 'Need data_option[:diff] param in days' if local_data_option[:diff].nil? - end + return if !data_type_changed? + return if (data_type_change - allowable_changes).empty? - true + errors.add(:data_type, "can't be altered after creation " \ + '(delete the attribute and create another with the desired value)') end - def verify_possible_type_change - return true if changes_to_save['data_type'].blank? + def local_data_option + @local_data_option ||= send(local_data_attr) + end - possible = { - 'select' => %w[tree_select select input checkbox], - 'tree_select' => %w[tree_select select input checkbox], - 'checkbox' => %w[tree_select select input checkbox], - 'input' => %w[tree_select select input checkbox], - } + def local_data_attr + @local_data_attr ||= to_config ? :data_option_new : :data_option + end - return true if possible[changes_to_save['data_type'][0]]&.include?(changes_to_save['data_type'][1]) + def local_data_option=(val) + send("#{local_data_attr}=", val) + end - raise 'Can\'t be changed data_type of attribute. Drop the attribute and recreate it with new data_type.' + def data_option_validations + case data_type + when 'input' + [{ failed: %w[text password tel fax email url].exclude?(local_data_option[:type]), + message: 'must have one of text/password/tel/fax/email/url for :type' }, + { failed: !local_data_option[:maxlength].to_s.match?(/^\d+$/), + message: 'must have integer for :maxlength' }] + when 'richtext' + [{ failed: !local_data_option[:maxlength].to_s.match?(/^\d+$/), + message: 'must have integer for :maxlength' }] + when 'integer' + [{ failed: !local_data_option[:min].to_s.match?(/^\d+$/), + message: 'must have integer for :min' }, + { failed: !local_data_option[:max].to_s.match?(/^\d+$/), + message: 'must have integer for :max' }] + when /^((tree_)?select|checkbox)$/ + [{ failed: !local_data_option.key?(:default), + message: 'must have value for :default' }, + { failed: local_data_option[:options].nil? && local_data_option[:relation].nil?, + message: 'must have non-nil value for either :options or :relation' }] + when 'boolean' + [{ failed: !local_data_option.key?(:default), + message: 'must have boolean/undefined value for :default' }, + { failed: local_data_option[:options].nil?, + message: 'must have non-nil value for :options' }] + when 'datetime' + [{ failed: local_data_option[:future].nil?, + message: 'must have boolean value for :future' }, + { failed: local_data_option[:past].nil?, + message: 'must have boolean value for :past' }, + { failed: local_data_option[:diff].nil?, + message: 'must have integer value for :diff (in hours)' }] + when 'date' + [{ failed: local_data_option[:future].nil?, + message: 'must have boolean value for :future' }, + { failed: local_data_option[:past].nil?, + message: 'must have boolean value for :past' }, + { failed: local_data_option[:diff].nil?, + message: 'must have integer value for :diff (in days)' }] + else + [] + end end end diff --git a/app/models/observer/ticket/article/communicate_email/background_job.rb b/app/models/observer/ticket/article/communicate_email/background_job.rb index 87c4ceaef638..54114744c726 100644 --- a/app/models/observer/ticket/article/communicate_email/background_job.rb +++ b/app/models/observer/ticket/article/communicate_email/background_job.rb @@ -9,11 +9,10 @@ def perform # build subject ticket = Ticket.lookup(id: record.ticket_id) article_count = Ticket::Article.where(ticket_id: ticket.id).count - subject = if article_count > 1 - ticket.subject_build(record.subject, true) - else - ticket.subject_build(record.subject) - end + + subject_prefix_mode = record.preferences[:subtype] + + subject = ticket.subject_build(record.subject, subject_prefix_mode) # set retry count if !record.preferences['delivery_retry'] @@ -122,7 +121,7 @@ def log_error(local_record, message, channel = nil) local_record.preferences['delivery_channel_id'] = channel.id end local_record.preferences['delivery_status'] = 'fail' - local_record.preferences['delivery_status_message'] = message + local_record.preferences['delivery_status_message'] = message.encode!('UTF-8', 'UTF-8', invalid: :replace, replace: '?') local_record.preferences['delivery_status_date'] = Time.zone.now local_record.save! Rails.logger.error message diff --git a/app/models/observer/ticket/article/communicate_facebook/background_job.rb b/app/models/observer/ticket/article/communicate_facebook/background_job.rb index c48d61e78b19..b3a268f86b10 100644 --- a/app/models/observer/ticket/article/communicate_facebook/background_job.rb +++ b/app/models/observer/ticket/article/communicate_facebook/background_job.rb @@ -66,7 +66,7 @@ def perform def log_error(local_record, message) local_record.preferences['delivery_status'] = 'fail' - local_record.preferences['delivery_status_message'] = message + local_record.preferences['delivery_status_message'] = message.encode!('UTF-8', 'UTF-8', invalid: :replace, replace: '?') local_record.preferences['delivery_status_date'] = Time.zone.now local_record.save Rails.logger.error message diff --git a/app/models/observer/ticket/article/communicate_telegram/background_job.rb b/app/models/observer/ticket/article/communicate_telegram/background_job.rb index 1a0929472da8..9e1543cde820 100644 --- a/app/models/observer/ticket/article/communicate_telegram/background_job.rb +++ b/app/models/observer/ticket/article/communicate_telegram/background_job.rb @@ -87,7 +87,7 @@ def perform def log_error(local_record, message) local_record.preferences['delivery_status'] = 'fail' - local_record.preferences['delivery_status_message'] = message + local_record.preferences['delivery_status_message'] = message.encode!('UTF-8', 'UTF-8', invalid: :replace, replace: '?') local_record.preferences['delivery_status_date'] = Time.zone.now local_record.save Rails.logger.error message diff --git a/app/models/observer/ticket/article/communicate_twitter/background_job.rb b/app/models/observer/ticket/article/communicate_twitter/background_job.rb index fbd77f341560..b7f3257b45ba 100644 --- a/app/models/observer/ticket/article/communicate_twitter/background_job.rb +++ b/app/models/observer/ticket/article/communicate_twitter/background_job.rb @@ -105,7 +105,7 @@ def perform def log_error(local_record, message) local_record.preferences['delivery_status'] = 'fail' - local_record.preferences['delivery_status_message'] = message + local_record.preferences['delivery_status_message'] = message.encode!('UTF-8', 'UTF-8', invalid: :replace, replace: '?') local_record.preferences['delivery_status_date'] = Time.zone.now local_record.save Rails.logger.error message diff --git a/app/models/observer/ticket/article/fillup_from_email.rb b/app/models/observer/ticket/article/fillup_from_email.rb index c44c7fcd98dd..1a59bb69df23 100644 --- a/app/models/observer/ticket/article/fillup_from_email.rb +++ b/app/models/observer/ticket/article/fillup_from_email.rb @@ -24,7 +24,7 @@ def before_create(record) return true if type['name'] != 'email' # set subject if empty - ticket = Ticket.lookup(id: record.ticket_id) + ticket = record.ticket if !record.subject || record.subject == '' record.subject = ticket.title end @@ -44,7 +44,7 @@ def before_create(record) # set sender email_address = ticket.group.email_address if !email_address - raise "No email address found for group '#{ticket.group.name}'" + raise "No email address found for group '#{ticket.group.name}' (#{ticket.group_id})" end # remember email address for background job diff --git a/app/models/observer/transaction.rb b/app/models/observer/transaction.rb index 648e1ee7d96f..2e8b6ade5fcb 100644 --- a/app/models/observer/transaction.rb +++ b/app/models/observer/transaction.rb @@ -19,12 +19,14 @@ def self.commit(params = {}) end def self.perform(params) + puts "===Transaction perform" # return if we run import mode return if Setting.get('import_mode') # get buffer list = EventBuffer.list('transaction') + puts "EVENT BUFFER", list # reset buffer EventBuffer.reset('transaction') @@ -39,27 +41,43 @@ def self.perform(params) # get uniq objects list_objects = get_uniq_changes(list) + puts "list_objects", list_objects.inspect + puts '-1-' list_objects.each_value do |objects| + puts "objects in list_objects", objects objects.each_value do |item| + puts "item in objects", item + item[:changes]["organization_id"] = [1, nil] if item[:object] == "Ticket" and item[:type] == "update" # execute sync backends + puts '-2-' sync_backends.each do |backend| + + puts '-3-' execute_singel_backend(backend, item, params) + + puts '-4-' end + puts '-5-' # execute async backends Delayed::Job.enqueue(Transaction::BackgroundJob.new(item, params)) + + puts '-6-' end end end def self.execute_singel_backend(backend, item, params) + puts 'b',backend,'i', item,'p', params Rails.logger.debug { "Execute singel backend #{backend}" } begin UserInfo.current_user_id = nil integration = backend.new(item, params) + puts "integartion1", integration.pretty_inspect integration.perform rescue => e + puts "execute_singel_backend ERROR", e Rails.logger.error 'ERROR: ' + backend.inspect Rails.logger.error 'ERROR: ' + e.inspect Rails.logger.error e.backtrace.inspect @@ -114,6 +132,8 @@ def self.execute_singel_backend(backend, item, params) =end def self.get_uniq_changes(events) + puts "get_uniq_changes?" + puts events.inspect list_objects = {} events.each do |event| @@ -121,6 +141,8 @@ def self.get_uniq_changes(events) article = nil if event[:object] == 'Ticket::Article' article = Ticket::Article.find_by(id: event[:id]) + puts "Transaction article=====>" + puts article.inspect next if !article next if event[:type] == 'update' @@ -155,11 +177,16 @@ def self.get_uniq_changes(events) end # merge changes + puts "event[:changes]" + puts event[:changes] if event[:changes] + puts store[:changes] if !store[:changes] store[:changes] = event[:changes] else event[:changes].each do |key, value| + puts "changes" + puts key, value if !store[:changes][key] store[:changes][key] = value else diff --git a/app/models/observer/user/ref_object_touch.rb b/app/models/observer/user/ref_object_touch.rb index 07a380ec7686..f004db9a9373 100644 --- a/app/models/observer/user/ref_object_touch.rb +++ b/app/models/observer/user/ref_object_touch.rb @@ -22,26 +22,32 @@ def ref_object_touch(record) # touch old organization if changed member_ids = [] - organization_id_changed = record.saved_changes['organization_id'] - if organization_id_changed && organization_id_changed[0] != organization_id_changed[1] - if organization_id_changed[0] - - # featrue used for different propose, do not touch references - if User.where(organization_id: organization_id_changed[0]).count < 100 - organization = Organization.find(organization_id_changed[0]) - organization.touch # rubocop:disable Rails/SkipsModelValidations - member_ids = organization.member_ids + + if record.saved_changes['organization_id'] + organization_id_changed = record.saved_changes['organization_id'] + if organization_id_changed && organization_id_changed[0] != organization_id_changed[1] + if organization_id_changed[0] + + # featrue used for different propose, do not touch references + if User.where(organization_id: organization_id_changed[0]).count < 100 + organization = Organization.find(organization_id_changed[0]) + organization.touch # rubocop:disable Rails/SkipsModelValidations + member_ids = organization.member_ids + end end end end # touch new/current organization - if record.organization + if record.organizations # featrue used for different propose, do not touch references - if User.where(organization_id: record.organization_id).count < 100 - record.organization.touch # rubocop:disable Rails/SkipsModelValidations - member_ids += record.organization.member_ids + record.organizations.each do |org| + # if User.where(organization_id: record.organization_id).count < 100 + if org.members.count < 100 + org.touch # rubocop:disable Rails/SkipsModelValidations + member_ids += org.member_ids + end end end diff --git a/app/models/organization/assets.rb b/app/models/organization/assets.rb index 71b438387b14..5a231961666e 100644 --- a/app/models/organization/assets.rb +++ b/app/models/organization/assets.rb @@ -23,7 +23,7 @@ module Assets =end def assets(data) - + puts "Organization assets data", data.pretty_inspect app_model_organization = Organization.to_app_model app_model_user = User.to_app_model @@ -40,6 +40,7 @@ def assets(data) # loops, will be updated with lookup attributes later data[ app_model_organization ][ id ] = local_attributes + puts "Organization assets local_attributes", local_attributes.pretty_inspect if local_attributes['member_ids'].present? # featrue used for different propose, do limit references @@ -47,6 +48,7 @@ def assets(data) local_attributes['member_ids'] = local_attributes['member_ids'].sort[0, 100] end local_attributes['member_ids'].each do |local_user_id| + puts "Organization assets memberids local_user_id", local_user_id next if data[ app_model_user ] && data[ app_model_user ][ local_user_id ] user = User.lookup(id: local_user_id) next if !user @@ -57,11 +59,14 @@ def assets(data) data[ app_model_organization ][ id ] = local_attributes end %w[created_by_id updated_by_id].each do |local_user_id| + puts "Organization assets local_user_id", local_user_id next if !self[ local_user_id ] next if data[ app_model_user ][ self[ local_user_id ] ] user = User.lookup(id: self[ local_user_id ]) + puts "Organization assets user", user.pretty_inspect next if !user data = user.assets(data) + puts "Organization assets data(user)", data.pretty_inspect end data end diff --git a/app/models/organization/search.rb b/app/models/organization/search.rb index 08d38dd65338..dd117492ba86 100644 --- a/app/models/organization/search.rb +++ b/app/models/organization/search.rb @@ -4,6 +4,10 @@ class Organization module Search extend ActiveSupport::Concern + included do + include HasSearchSortable + end + # methods defined here are going to extend the class, not the instance of it class_methods do @@ -43,6 +47,14 @@ def search_preferences(current_user) query: 'search something', limit: 15, offset: 100, + + # sort single column + sort_by: 'created_at', + order_by: 'asc', + + # sort multiple columns + sort_by: [ 'created_at', 'updated_at' ], + order_by: [ 'asc', 'desc' ], ) returns @@ -59,12 +71,18 @@ def search(params) offset = params[:offset] || 0 current_user = params[:current_user] + # check sort + sort_by = search_get_sort_by(params, 'updated_at') + + # check order + order_by = search_get_order_by(params, 'desc') + # enable search only for agents and admins return [] if !search_preferences(current_user) # try search index backend if SearchIndexBackend.enabled? - items = SearchIndexBackend.search(query, limit, 'Organization', {}, offset) + items = SearchIndexBackend.search(query, limit, 'Organization', {}, offset, sort_by, order_by) organizations = [] items.each do |item| organization = Organization.lookup(id: item[:id]) @@ -74,11 +92,14 @@ def search(params) return organizations end + order_select_sql = search_get_order_select_sql(sort_by, order_by, 'organizations.updated_at') + order_sql = search_get_order_sql(sort_by, order_by, 'organizations.updated_at ASC') + # fallback do sql query # - stip out * we already search for *query* - query.delete! '*' organizations = Organization.where_or_cis(%i[name note], "%#{query}%") - .order('name') + .order(order_sql) .offset(offset) .limit(limit) .to_a @@ -89,10 +110,10 @@ def search(params) return organizations if organizations.length > 3 # if only a few organizations are found, search for names of users - organizations_by_user = Organization.select('DISTINCT(organizations.id), organizations.name') + organizations_by_user = Organization.select("DISTINCT(organizations.id), #{order_select_sql}") .joins('LEFT OUTER JOIN users ON users.organization_id = organizations.id') .where(User.or_cis(%i[firstname lastname email], "%#{query}%")) - .order('organizations.name') + .order(order_sql) .limit(limit) organizations_by_user.each do |organization_by_user| diff --git a/app/models/recent_view.rb b/app/models/recent_view.rb index e02e3af825b2..d66ea3d8071a 100644 --- a/app/models/recent_view.rb +++ b/app/models/recent_view.rb @@ -13,24 +13,16 @@ class RecentView < ApplicationModel after_destroy :notify_clients def self.log(object, o_id, user) - - # access check return if !access(object, o_id, user) - # lookups - object_lookup_id = ObjectLookup.by_name(object) - - # create entry - record = { - o_id: o_id, - recent_view_object_id: object_lookup_id.to_i, - created_by_id: user.id, - } - RecentView.create(record) + RecentView.create(o_id: o_id, + recent_view_object_id: ObjectLookup.by_name(object), + created_by_id: user.id) end def self.log_destroy(requested_object, requested_object_id) return if requested_object == 'RecentView' + RecentView.where(recent_view_object_id: ObjectLookup.by_name(requested_object)) .where(o_id: requested_object_id) .destroy_all @@ -41,43 +33,34 @@ def self.user_log_destroy(user) end def self.list(user, limit = 10, object_name = nil) - recent_views = if !object_name - RecentView.select('o_id, recent_view_object_id, MAX(created_at) as created_at, MAX(id) as id, created_by_id') - .group(:o_id, :recent_view_object_id, :created_by_id) - .where(created_by_id: user.id) - .limit(limit) - elsif object_name == 'Ticket' - state_ids = Ticket::State.by_category(:viewable_agent_new).pluck(:id) - local_recent_views = RecentView.select('o_id, recent_view_object_id, MAX(created_at) as created_at, MAX(id) as id, created_by_id') - .group(:o_id, :recent_view_object_id, :created_by_id) - .where(created_by_id: user.id, recent_view_object_id: ObjectLookup.by_name(object_name)) - .limit(limit + 10) - clear_list = [] - local_recent_views.each do |item| - ticket = Ticket.find_by(id: item.o_id) - next if !ticket - next if !state_ids.include?(ticket.state_id) - clear_list.push item - break if clear_list.count == limit - end - clear_list - else - RecentView.select('o_id, recent_view_object_id, MAX(created_at) as created_at, MAX(id) as id, created_by_id') - .group(:o_id, :recent_view_object_id, :created_by_id) - .where(created_by_id: user.id, recent_view_object_id: ObjectLookup.by_name(object_name)) - .limit(limit) - end - - list = [] - recent_views.each do |item| - - # access check - next if !access(ObjectLookup.by_id(item['recent_view_object_id']), item['o_id'], user) - - # add to result list - list.push item + recent_views = RecentView.select('o_id, ' \ + 'recent_view_object_id, ' \ + 'created_by_id, ' \ + 'MAX(created_at) as created_at, ' \ + 'MAX(id) as id') + .group(:o_id, :recent_view_object_id, :created_by_id) + .where(created_by_id: user.id) + .order('MAX(created_at) DESC, MAX(id) DESC') + .limit(limit) + + if object_name.present? + recent_views = recent_views.where(recent_view_object_id: ObjectLookup.by_name(object_name)) end - list + + # hide merged / removed tickets in Ticket Merge dialog + if object_name == 'Ticket' + recent_views = recent_views.limit(limit * 2) + + viewable_ticket_ids = Ticket.where('id IN (?) AND state_id in (?)', + recent_views.map(&:o_id), + Ticket::State.by_category(:viewable_agent_new).pluck(:id)) + .pluck(:id) + + recent_views = recent_views.select { |rv| viewable_ticket_ids.include?(rv.o_id) } + .first(limit) + end + + recent_views.select { |rv| access(ObjectLookup.by_id(rv.recent_view_object_id), rv.o_id, user) } end def notify_clients @@ -91,19 +74,12 @@ def notify_clients end def self.access(object, o_id, user) - - # check if object exists - begin - return if !Kernel.const_get(object) - record = Kernel.const_get(object).lookup(id: o_id) - return if !record - rescue - return - end - - # check permission - return if !record.respond_to?(:access?) - record.access?(user, 'read') + object.to_s + .constantize + .try(:lookup, { id: o_id }) + .try(:access?, user, 'read') + rescue NameError + false end =begin diff --git a/app/models/role.rb b/app/models/role.rb index fc62f1c451e7..48b18bcbafab 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -16,6 +16,8 @@ class Role < ApplicationModel before_create :validate_permissions, :check_default_at_signup_permissions before_update :validate_permissions, :last_admin_check_by_attribute, :validate_agent_limit_by_attributes, :check_default_at_signup_permissions + # ignore Users because this will lead to huge + # results for e.g. the Customer role association_attributes_ignored :users activity_stream_permission 'admin.role' @@ -184,7 +186,7 @@ def last_admin_check_admin_count end def validate_agent_limit_by_attributes - return true if !Setting.get('system_agent_limit') + return true if Setting.get('system_agent_limit').blank? return true if !will_save_change_to_attribute?('active') return true if active != true return true if !with_permission?('ticket.agent') @@ -192,19 +194,19 @@ def validate_agent_limit_by_attributes currents = User.joins(:roles).where(roles: { id: ticket_agent_role_ids }, users: { active: true }).distinct().pluck(:id) news = User.joins(:roles).where(roles: { id: id }, users: { active: true }).distinct().pluck(:id) count = currents.concat(news).uniq.count - raise Exceptions::UnprocessableEntity, 'Agent limit exceeded, please check your account settings.' if count > Setting.get('system_agent_limit') + raise Exceptions::UnprocessableEntity, 'Agent limit exceeded, please check your account settings.' if count > Setting.get('system_agent_limit').to_i true end def validate_agent_limit_by_permission(permission) - return true if !Setting.get('system_agent_limit') + return true if Setting.get('system_agent_limit').blank? return true if active != true return true if permission.active != true return true if permission.name != 'ticket.agent' ticket_agent_role_ids = Role.joins(:permissions).where(permissions: { name: 'ticket.agent' }, roles: { active: true }).pluck(:id) ticket_agent_role_ids.push(id) count = User.joins(:roles).where(roles: { id: ticket_agent_role_ids }, users: { active: true }).distinct().count - raise Exceptions::UnprocessableEntity, 'Agent limit exceeded, please check your account settings.' if count > Setting.get('system_agent_limit') + raise Exceptions::UnprocessableEntity, 'Agent limit exceeded, please check your account settings.' if count > Setting.get('system_agent_limit').to_i true end diff --git a/app/models/scheduler.rb b/app/models/scheduler.rb index 5aa54e7cab05..5710d400d0ff 100644 --- a/app/models/scheduler.rb +++ b/app/models/scheduler.rb @@ -233,7 +233,9 @@ def self.start_job(job) # start loop for periods equal or under 5 minutes if job.period && job.period <= 5.minutes + loop_count = 0 loop do + loop_count += 1 _start_job(job) job = Scheduler.lookup(id: job.id) @@ -246,6 +248,9 @@ def self.start_job(job) # exit if there is no loop period defined break if !job.period + # only do a certain amount of loops in this thread + break if loop_count == 1800 + # wait until next run sleep job.period end @@ -340,7 +345,7 @@ def self.worker(foreground = false) end # used for production - wait = 8 + wait = 4 Thread.new do sleep wait diff --git a/app/models/setting.rb b/app/models/setting.rb index 73058483c894..d08c84a48885 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -51,7 +51,7 @@ def self.set(name, value) def self.get(name) load - @@current[name] + @@current[name].deep_dup # prevents accidental modification of settings in console end =begin diff --git a/app/models/store.rb b/app/models/store.rb index 41ddb9b171f1..516f06588e6d 100644 --- a/app/models/store.rb +++ b/app/models/store.rb @@ -192,6 +192,10 @@ def save_to_file(path = nil) path end + def attributes_for_display + slice :id, :filename, :size, :preferences + end + def provider file = Store::File.find_by(id: store_file_id) if !file diff --git a/app/models/store/provider/file.rb b/app/models/store/provider/file.rb index d454612ff1ac..153872441d35 100644 --- a/app/models/store/provider/file.rb +++ b/app/models/store/provider/file.rb @@ -7,6 +7,17 @@ def self.add(data, sha) # install file location = get_location(sha) permission = '600' + + # verify if file already is in file system and if it's not corrupt + if File.exist?(location) + begin + get(sha) + rescue + delete(sha) + end + end + + # write file to file system if !File.exist?(location) Rails.logger.debug { "storge write '#{location}' (#{permission})" } file = File.new(location, 'wb') diff --git a/app/models/tag.rb b/app/models/tag.rb index adc3b07466ea..b885763abac6 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -259,6 +259,8 @@ def self.rename(data) return true end + update_referenced_objects(old_tag_item.name, new_tag_name) + # update new tag name old_tag_item.name = new_tag_name old_tag_item.save @@ -303,6 +305,52 @@ def fill_namedowncase true end +=begin + + Update referenced objects such as triggers, overviews, schedulers, and postmaster filters + + Specifically, the following fields are updated: + + Overview.condition + Trigger.condition Trigger.perform + Job.condition Job.perform + PostmasterFilter.perform + +=end + + def self.update_referenced_objects(old_name, new_name) + objects = Overview.all + Trigger.all + Job.all + PostmasterFilter.all + + objects.each do |object| + changed = false + if object.has_attribute?(:condition) + changed |= update_condition_hash object.condition, old_name, new_name + end + if object.has_attribute?(:perform) + changed |= update_condition_hash object.perform, old_name, new_name + end + object.save if changed + end + end + + def self.update_condition_hash(hash, old_name, new_name) + changed = false + hash.each do |key, condition| + next if %w[ticket.tags x-zammad-ticket-tags].exclude? key + next if condition[:value].split(', ').exclude? old_name + condition[:value] = update_name(condition[:value], old_name, new_name) + changed = true + end + changed + end + + def self.update_name(condition, old_name, new_name) + tags = condition.split(', ') + return new_name if tags.size == 1 + tags = tags.map { |t| t == old_name ? new_name : t } + tags.join(', ') + end + end end diff --git a/app/models/taskbar.rb b/app/models/taskbar.rb index ba4c64fe8507..b96f2d4413ff 100644 --- a/app/models/taskbar.rb +++ b/app/models/taskbar.rb @@ -16,8 +16,9 @@ def state_changed? return false if state.blank? state.each_value do |value| if value.is_a? Hash - value.each_value do |value1| + value.each do |key1, value1| next if value1.blank? + next if key1 == 'form_id' return true end else @@ -28,8 +29,37 @@ def state_changed? false end + def attributes_with_association_names + add_attachments_to_attributes(super) + end + + def attributes_with_association_ids + add_attachments_to_attributes(super) + end + + def as_json(options = {}) + add_attachments_to_attributes(super) + end + + # form_id is saved directly in a new ticket, but inside of the article when updating an existing ticket + def persisted_form_id + state&.dig(:form_id) || state&.dig(:article, :form_id) + end + private + def attachments + return [] if persisted_form_id.blank? + + Store.list(object: 'UploadCache', o_id: persisted_form_id) + end + + def add_attachments_to_attributes(attributes) + attributes.tap do |result| + result['attachments'] = attachments.map(&:attributes_for_display) + end + end + def update_last_contact return true if local_update return true if changes.blank? diff --git a/app/models/ticket.rb b/app/models/ticket.rb index 66a7fad0dbe1..c0a007053d7c 100644 --- a/app/models/ticket.rb +++ b/app/models/ticket.rb @@ -88,10 +88,12 @@ class Ticket < ApplicationModel def self.access_condition(user, access) if user.permissions?('ticket.agent') ['group_id IN (?)', user.group_ids_access(access)] - elsif !user.organization || ( !user.organization.shared || user.organization.shared == false ) - ['tickets.customer_id = ?', user.id] - else + elsif user.organization ['(tickets.customer_id = ? OR tickets.organization_id = ?)', user.id, user.organization.id] + elsif user.organizations.any? + ['(tickets.customer_id = ? OR tickets.organization_id IN (?))', user.id, user.organizations.map { |org| org.id }] + else + ['tickets.customer_id = ?', user.id] end end @@ -420,12 +422,15 @@ def self.selectors(selectors, limit = 10, current_user = nil, access = 'full') raise 'no selectors given' if !selectors query, bind_params, tables = selector2sql(selectors, current_user) return [] if !query - + puts "===Ticket.selectors","q",query,"b",bind_params,"t",tables ActiveRecord::Base.transaction(requires_new: true) do begin + puts "===Ticket.selectors current_user", current_user + if !current_user ticket_count = Ticket.distinct.where(query, *bind_params).joins(tables).count tickets = Ticket.distinct.where(query, *bind_params).joins(tables).limit(limit) + puts "TICKETS SQL",tickets.to_sql return [ticket_count, tickets] end @@ -465,7 +470,7 @@ def self.selectors(selectors, limit = 10, current_user = nil, access = 'full') value: '2015-10-17T06:00:00.000Z', }, 'ticket.created_at' => { - operator: 'within next (relative)', # before,within,in,after + operator: 'within next (relative)', # within next, within last, after, before range: 'day', # minute|hour|day|month|year value: '25', }, @@ -544,9 +549,12 @@ def self.selector2sql(selectors, current_user = nil) raise "Invalid selector #{selector_raw.inspect}" if !selector_raw.respond_to?(:key?) selector = selector_raw.stringify_keys raise "Invalid selector, operator missing #{selector.inspect}" if !selector['operator'] + raise "Invalid selector, operator #{selector['operator']} is invalid #{selector.inspect}" if selector['operator'] !~ /^(is|is\snot|contains|contains\s(not|all|one|all\snot|one\snot)|(after|before)\s\(absolute\)|(within\snext|within\slast|after|before)\s\(relative\))$/ # validate value / allow blank but only if pre_condition exists and is not specific - if !selector.key?('value') || ((selector['value'].class == String || selector['value'].class == Array) && (selector['value'].respond_to?(:blank?) && selector['value'].blank?)) + if !selector.key?('value') || + (selector['value'].class == Array && selector['value'].respond_to?(:blank?) && selector['value'].blank?) || + (selector['operator'] =~ /^contains/ && selector['value'].respond_to?(:blank?) && selector['value'].blank?) return nil if selector['pre_condition'].nil? return nil if selector['pre_condition'].respond_to?(:blank?) && selector['pre_condition'].blank? return nil if selector['pre_condition'] == 'specific' @@ -575,7 +583,7 @@ def self.selector2sql(selectors, current_user = nil) if selector['operator'] == 'is' if selector['pre_condition'] == 'not_set' if attributes[1].match?(/^(created_by|updated_by|owner|customer|user)_id/) - query += "#{attribute} IN (?)" + query += "(#{attribute} IS NULL OR #{attribute} IN (?))" bind_params.push 1 else query += "#{attribute} IS NULL" @@ -591,17 +599,28 @@ def self.selector2sql(selectors, current_user = nil) elsif selector['pre_condition'] == 'current_user.organization_id' raise "Use current_user.id in selector, but no current_user is set #{selector.inspect}" if !current_user_id query += "#{attribute} IN (?)" - user = User.find_by(id: current_user_id) - bind_params.push user.organization_id + user = User.lookup(id: current_user_id) + organizations = [] + organizations.push user.organization_id if user.organization_id + organizations.concat user.organization_ids if user.organization_ids&.any? + bind_params.push organizations else # rubocop:disable Style/IfInsideElse if selector['value'].nil? query += "#{attribute} IS NULL" else - query += "#{attribute} IN (?)" if attributes[1] == 'out_of_office_replacement_id' + query += "#{attribute} IN (?)" bind_params.push User.find(selector['value']).out_of_office_agent_of.pluck(:id) else + if selector['value'].class != Array + selector['value'] = [selector['value']] + end + query += if selector['value'].include?('') + "(#{attribute} IN (?) OR #{attribute} IS NULL)" + else + "#{attribute} IN (?)" + end bind_params.push selector['value'] end end @@ -610,31 +629,42 @@ def self.selector2sql(selectors, current_user = nil) elsif selector['operator'] == 'is not' if selector['pre_condition'] == 'not_set' if attributes[1].match?(/^(created_by|updated_by|owner|customer|user)_id/) - query += "#{attribute} NOT IN (?)" + query += "(#{attribute} IS NOT NULL AND #{attribute} NOT IN (?))" bind_params.push 1 else query += "#{attribute} IS NOT NULL" end elsif selector['pre_condition'] == 'current_user.id' - query += "#{attribute} NOT IN (?)" + query += "(#{attribute} IS NULL OR #{attribute} NOT IN (?))" if attributes[1] == 'out_of_office_replacement_id' bind_params.push User.find(current_user_id).out_of_office_agent_of.pluck(:id) else bind_params.push current_user_id end elsif selector['pre_condition'] == 'current_user.organization_id' - query += "#{attribute} NOT IN (?)" - user = User.find_by(id: current_user_id) - bind_params.push user.organization_id + query += "(#{attribute} IS NULL OR #{attribute} NOT IN (?))" + user = User.lookup(id: current_user_id) + organizations = [] + organizations.push user.organization_id if user.organization_id + organizations.concat user.organization_ids if user.organization_ids&.any? + bind_params.push organizations else # rubocop:disable Style/IfInsideElse if selector['value'].nil? query += "#{attribute} IS NOT NULL" else - query += "#{attribute} NOT IN (?)" if attributes[1] == 'out_of_office_replacement_id' bind_params.push User.find(selector['value']).out_of_office_agent_of.pluck(:id) + query += "(#{attribute} IS NULL OR #{attribute} NOT IN (?))" else + if selector['value'].class != Array + selector['value'] = [selector['value']] + end + query += if selector['value'].include?('') + "(#{attribute} IS NOT NULL AND #{attribute} NOT IN (?))" + else + "(#{attribute} IS NULL OR #{attribute} NOT IN (?))" + end bind_params.push selector['value'] end end @@ -824,219 +854,15 @@ def perform_changes(perform, perform_origin, item = nil, current_user_id = nil) end end + perform_notification = {} changed = false perform.each do |key, value| (object_name, attribute) = key.split('.', 2) raise "Unable to update object #{object_name}.#{attribute}, only can update tickets and send notifications!" if object_name != 'ticket' && object_name != 'notification' - # send notification + # send notification (after changes are done) if object_name == 'notification' - - # value['recipient'] was a string in the past (single-select) so we convert it to array if needed - value_recipient = value['recipient'] - if !value_recipient.is_a?(Array) - value_recipient = [value_recipient] - end - - recipients_raw = [] - value_recipient.each do |recipient| - if recipient == 'article_last_sender' - if article.present? - if article.reply_to.present? - recipients_raw.push(article.reply_to) - elsif article.from.present? - recipients_raw.push(article.from) - elsif article.origin_by_id - email = User.find_by(id: article.origin_by_id).email - recipients_raw.push(email) - elsif article.created_by_id - email = User.find_by(id: article.created_by_id).email - recipients_raw.push(email) - end - end - elsif recipient == 'ticket_customer' - email = User.find_by(id: customer_id).email - recipients_raw.push(email) - elsif recipient == 'ticket_owner' - email = User.find_by(id: owner_id).email - recipients_raw.push(email) - elsif recipient == 'ticket_agents' - User.group_access(group_id, 'full').sort_by(&:login).each do |user| - recipients_raw.push(user.email) - end - else - logger.error "Unknown email notification recipient '#{recipient}'" - next - end - end - - recipients_checked = [] - recipients_raw.each do |recipient_email| - - skip_user = false - users = User.where(email: recipient_email) - users.each do |user| - next if user.preferences[:mail_delivery_failed] != true - next if !user.preferences[:mail_delivery_failed_data] - till_blocked = ((user.preferences[:mail_delivery_failed_data] - Time.zone.now - 60.days) / 60 / 60 / 24).round - next if till_blocked.positive? - logger.info "Send no trigger based notification to #{recipient_email} because email is marked as mail_delivery_failed for #{till_blocked} days" - skip_user = true - break - end - next if skip_user - - # send notifications only to email adresses - next if recipient_email.blank? - next if recipient_email !~ /@/ - - # check if address is valid - begin - Mail::AddressList.new(recipient_email).addresses.each do |address| - recipient_email = address.address - break if recipient_email.present? && recipient_email =~ /@/ && !recipient_email.match?(/\s/) - end - rescue - if recipient_email.present? - if recipient_email !~ /^(.+?)<(.+?)@(.+?)>$/ - next # no usable format found - end - recipient_email = "#{$2}@#{$3}" - end - next if recipient_email.blank? - next if recipient_email !~ /@/ - next if recipient_email.match?(/\s/) - end - - # do not sent notifications to this recipients - send_no_auto_response_reg_exp = Setting.get('send_no_auto_response_reg_exp') - begin - next if recipient_email.match?(/#{send_no_auto_response_reg_exp}/i) - rescue => e - logger.error "ERROR: Invalid regex '#{send_no_auto_response_reg_exp}' in setting send_no_auto_response_reg_exp" - logger.error 'ERROR: ' + e.inspect - next if recipient_email.match?(/(mailer-daemon|postmaster|abuse|root|noreply|noreply.+?|no-reply|no-reply.+?)@.+?/i) - end - - # check if notification should be send because of customer emails - if article.present? && article.preferences.fetch('is-auto-response', false) == true && article.from && article.from =~ /#{Regexp.quote(recipient_email)}/i - logger.info "Send no trigger based notification to #{recipient_email} because of auto response tagged incoming email" - next - end - - # loop protection / check if maximal count of trigger mail has reached - map = { - 10 => 10, - 30 => 15, - 60 => 25, - 180 => 50, - 600 => 100, - } - skip = false - map.each do |minutes, count| - already_sent = Ticket::Article.where( - ticket_id: id, - sender: Ticket::Article::Sender.find_by(name: 'System'), - type: Ticket::Article::Type.find_by(name: 'email'), - ).where('ticket_articles.created_at > ? AND ticket_articles.to LIKE ?', Time.zone.now - minutes.minutes, "%#{recipient_email.strip}%").count - next if already_sent < count - logger.info "Send no trigger based notification to #{recipient_email} because already sent #{count} for this ticket within last #{minutes} minutes (loop protection)" - skip = true - break - end - next if skip - map = { - 10 => 30, - 30 => 60, - 60 => 120, - 180 => 240, - 600 => 360, - } - skip = false - map.each do |minutes, count| - already_sent = Ticket::Article.where( - sender: Ticket::Article::Sender.find_by(name: 'System'), - type: Ticket::Article::Type.find_by(name: 'email'), - ).where('ticket_articles.created_at > ? AND ticket_articles.to LIKE ?', Time.zone.now - minutes.minutes, "%#{recipient_email.strip}%").count - next if already_sent < count - logger.info "Send no trigger based notification to #{recipient_email} because already sent #{count} in total within last #{minutes} minutes (loop protection)" - skip = true - break - end - next if skip - - email = recipient_email.downcase.strip - next if recipients_checked.include?(email) - recipients_checked.push(email) - end - - next if recipients_checked.blank? - recipient_string = recipients_checked.join(', ') - - group = self.group - next if !group - email_address = group.email_address - if !email_address - logger.info "Unable to send trigger based notification to #{recipient_string} because no email address is set for group '#{group.name}'" - next - end - - if !email_address.channel_id - logger.info "Unable to send trigger based notification to #{recipient_string} because no channel is set for email address '#{email_address.email}' (id: #{email_address.id})" - next - end - - # articles.last breaks (returns the wrong article) - # if another email notification trigger preceded this one - # (see https://github.com/zammad/zammad/issues/1543) - objects = { - ticket: self, - article: article || articles.last - } - - # get subject - subject = NotificationFactory::Mailer.template( - templateInline: value['subject'], - locale: 'en-en', - objects: objects, - quote: false, - ) - subject = subject_build(subject) - - body = NotificationFactory::Mailer.template( - templateInline: value['body'], - locale: 'en-en', - objects: objects, - quote: true, - ) - - (body, attachments_inline) = HtmlSanitizer.replace_inline_images(body, id) - - message = Ticket::Article.create( - ticket_id: id, - to: recipient_string, - subject: subject, - content_type: 'text/html', - body: body, - internal: false, - sender: Ticket::Article::Sender.find_by(name: 'System'), - type: Ticket::Article::Type.find_by(name: 'email'), - preferences: { - perform_origin: perform_origin, - }, - updated_by_id: 1, - created_by_id: 1, - ) - - attachments_inline.each do |attachment| - Store.add( - object: 'Ticket::Article', - o_id: message.id, - data: attachment[:data], - filename: attachment[:filename], - preferences: attachment[:preferences], - ) - end + perform_notification[key] = value next end @@ -1062,6 +888,7 @@ def perform_changes(perform, perform_origin, item = nil, current_user_id = nil) if key == 'ticket.action' next if value['value'].blank? next if value['value'] != 'delete' + logger.debug { "Deleted ticket from #{perform_origin} #{perform.inspect} Ticket.find(#{id})" } destroy! next end @@ -1081,10 +908,227 @@ def perform_changes(perform, perform_origin, item = nil, current_user_id = nil) changed = true self[attribute] = value['value'] - logger.debug { "set #{object_name}.#{attribute} = #{value['value'].inspect}" } + logger.debug { "set #{object_name}.#{attribute} = #{value['value'].inspect} for ticket_id #{id}" } + end + + if changed + save! + end + + perform_notification.each do |key, value| + perform_changes_notification(key, value, perform_origin, article) + end + + true + end + + def perform_changes_notification(_key, value, perform_origin, article) + + # value['recipient'] was a string in the past (single-select) so we convert it to array if needed + value_recipient = value['recipient'] + if !value_recipient.is_a?(Array) + value_recipient = [value_recipient] + end + + recipients_raw = [] + value_recipient.each do |recipient| + if recipient == 'article_last_sender' + if article.present? + if article.reply_to.present? + recipients_raw.push(article.reply_to) + elsif article.from.present? + recipients_raw.push(article.from) + elsif article.origin_by_id + email = User.find_by(id: article.origin_by_id).email + recipients_raw.push(email) + elsif article.created_by_id + email = User.find_by(id: article.created_by_id).email + recipients_raw.push(email) + end + end + elsif recipient == 'ticket_customer' + email = User.find_by(id: customer_id).email + recipients_raw.push(email) + elsif recipient == 'ticket_owner' + email = User.find_by(id: owner_id).email + recipients_raw.push(email) + elsif recipient == 'ticket_agents' + User.group_access(group_id, 'full').sort_by(&:login).each do |user| + recipients_raw.push(user.email) + end + else + logger.error "Unknown email notification recipient '#{recipient}'" + next + end + end + + recipients_checked = [] + recipients_raw.each do |recipient_email| + + skip_user = false + users = User.where(email: recipient_email) + users.each do |user| + next if user.preferences[:mail_delivery_failed] != true + next if !user.preferences[:mail_delivery_failed_data] + till_blocked = ((user.preferences[:mail_delivery_failed_data] - Time.zone.now - 60.days) / 60 / 60 / 24).round + next if till_blocked.positive? + logger.info "Send no trigger based notification to #{recipient_email} because email is marked as mail_delivery_failed for #{till_blocked} days" + skip_user = true + break + end + next if skip_user + + # send notifications only to email adresses + next if recipient_email.blank? + next if recipient_email !~ /@/ + + # check if address is valid + begin + Mail::AddressList.new(recipient_email).addresses.each do |address| + recipient_email = address.address + break if recipient_email.present? && recipient_email =~ /@/ && !recipient_email.match?(/\s/) + end + rescue + if recipient_email.present? + if recipient_email !~ /^(.+?)<(.+?)@(.+?)>$/ + next # no usable format found + end + recipient_email = "#{$2}@#{$3}" + end + next if recipient_email.blank? + next if recipient_email !~ /@/ + next if recipient_email.match?(/\s/) + end + + # do not sent notifications to this recipients + send_no_auto_response_reg_exp = Setting.get('send_no_auto_response_reg_exp') + begin + next if recipient_email.match?(/#{send_no_auto_response_reg_exp}/i) + rescue => e + logger.error "ERROR: Invalid regex '#{send_no_auto_response_reg_exp}' in setting send_no_auto_response_reg_exp" + logger.error 'ERROR: ' + e.inspect + next if recipient_email.match?(/(mailer-daemon|postmaster|abuse|root|noreply|noreply.+?|no-reply|no-reply.+?)@.+?/i) + end + + # check if notification should be send because of customer emails + if article.present? && article.preferences.fetch('is-auto-response', false) == true && article.from && article.from =~ /#{Regexp.quote(recipient_email)}/i + logger.info "Send no trigger based notification to #{recipient_email} because of auto response tagged incoming email" + next + end + + # loop protection / check if maximal count of trigger mail has reached + map = { + 10 => 10, + 30 => 15, + 60 => 25, + 180 => 50, + 600 => 100, + } + skip = false + map.each do |minutes, count| + already_sent = Ticket::Article.where( + ticket_id: id, + sender: Ticket::Article::Sender.find_by(name: 'System'), + type: Ticket::Article::Type.find_by(name: 'email'), + ).where('ticket_articles.created_at > ? AND ticket_articles.to LIKE ?', Time.zone.now - minutes.minutes, "%#{recipient_email.strip}%").count + next if already_sent < count + logger.info "Send no trigger based notification to #{recipient_email} because already sent #{count} for this ticket within last #{minutes} minutes (loop protection)" + skip = true + break + end + next if skip + map = { + 10 => 30, + 30 => 60, + 60 => 120, + 180 => 240, + 600 => 360, + } + skip = false + map.each do |minutes, count| + already_sent = Ticket::Article.where( + sender: Ticket::Article::Sender.find_by(name: 'System'), + type: Ticket::Article::Type.find_by(name: 'email'), + ).where('ticket_articles.created_at > ? AND ticket_articles.to LIKE ?', Time.zone.now - minutes.minutes, "%#{recipient_email.strip}%").count + next if already_sent < count + logger.info "Send no trigger based notification to #{recipient_email} because already sent #{count} in total within last #{minutes} minutes (loop protection)" + skip = true + break + end + next if skip + + email = recipient_email.downcase.strip + next if recipients_checked.include?(email) + recipients_checked.push(email) + end + + return if recipients_checked.blank? + recipient_string = recipients_checked.join(', ') + + group_id = self.group_id + return if !group_id + email_address = Group.find(group_id).email_address + if !email_address + logger.info "Unable to send trigger based notification to #{recipient_string} because no email address is set for group '#{group.name}'" + return + end + + if !email_address.channel_id + logger.info "Unable to send trigger based notification to #{recipient_string} because no channel is set for email address '#{email_address.email}' (id: #{email_address.id})" + return + end + + # articles.last breaks (returns the wrong article) + # if another email notification trigger preceded this one + # (see https://github.com/zammad/zammad/issues/1543) + objects = { + ticket: self, + article: article || articles.last + } + + # get subject + subject = NotificationFactory::Mailer.template( + templateInline: value['subject'], + locale: 'en-en', + objects: objects, + quote: false, + ) + subject = subject_build(subject) + + body = NotificationFactory::Mailer.template( + templateInline: value['body'], + locale: 'en-en', + objects: objects, + quote: true, + ) + + (body, attachments_inline) = HtmlSanitizer.replace_inline_images(body, id) + + message = Ticket::Article.create( + ticket_id: id, + to: recipient_string, + subject: subject, + content_type: 'text/html', + body: body, + internal: false, + sender: Ticket::Article::Sender.find_by(name: 'System'), + type: Ticket::Article::Type.find_by(name: 'email'), + preferences: { + perform_origin: perform_origin, + }, + updated_by_id: 1, + created_by_id: 1, + ) + + attachments_inline.each do |attachment| + Store.add( + object: 'Ticket::Article', + o_id: message.id, + data: attachment[:data], + filename: attachment[:filename], + preferences: attachment[:preferences], + ) end - return if !changed - save true end @@ -1098,6 +1142,7 @@ def perform_changes(perform, perform_origin, item = nil, current_user_id = nil) =end def self.perform_triggers(ticket, article, item, options = {}) + puts "Ticket.perform_triggers","t",ticket,"a", article,"i", item,"o", options recursive = Setting.get('ticket_trigger_recursive') type = options[:type] || item[:type] local_options = options.clone @@ -1110,6 +1155,7 @@ def self.perform_triggers(ticket, article, item, options = {}) local_options[:loop_count] += 1 ticket_trigger_recursive_max_loop = Setting.get('ticket_trigger_recursive_max_loop')&.to_i || 10 + puts "local_options", local_options.pretty_inspect if local_options[:loop_count] > ticket_trigger_recursive_max_loop message = "Stopped perform_triggers for this object (Ticket/#{ticket.id}), because loop count was #{local_options[:loop_count]}!" logger.info { message } @@ -1121,6 +1167,8 @@ def self.perform_triggers(ticket, article, item, options = {}) else ::Trigger.where(active: true).order(:name) end + + puts "triggers", triggers.pretty_inspect return [true, 'No triggers active'] if triggers.blank? # check if notification should be send because of customer emails @@ -1135,7 +1183,11 @@ def self.perform_triggers(ticket, article, item, options = {}) end Transaction.execute(local_options) do + puts "TICKET TRANSACTION local_option", local_options.pretty_inspect + puts "TICKET TRANSACTION triggers", triggers.pretty_inspect triggers.each do |trigger| + puts "Probe trigger (#{trigger.name}/#{trigger.id}) for this object (Ticket:#{ticket.id}/Loop:#{local_options[:loop_count]})" + condition = trigger.condition # check if one article attribute is used @@ -1185,6 +1237,7 @@ def self.perform_triggers(ticket, article, item, options = {}) next if condition['ticket.action']['operator'] != 'is' && condition['ticket.action']['value'] == type condition.delete('ticket.action') end + puts "TICKET TRANSACTION triggers has_changed_done", !has_changed_done next if !has_changed_done # check in min one attribute of condition has changed on update @@ -1219,9 +1272,12 @@ def self.perform_triggers(ticket, article, item, options = {}) } end + puts "TICKET TRANSACTION triggers condition", condition.pretty_inspect # verify is condition is matching ticket_count, tickets = Ticket.selectors(condition, 1) + puts "TICKET TRANSACTION triggers ticket_count, tickets", ticket_count, tickets.pretty_inspect + next if ticket_count.blank? next if ticket_count.zero? next if tickets.first.id != ticket.id @@ -1351,14 +1407,13 @@ def check_title end def check_defaults - if !owner_id - self.owner_id = 1 - end + self.owner_id = 1 if !owner_id return true if !customer_id customer = User.find_by(id: customer_id) return true if !customer - return true if organization_id == customer.organization_id - self.organization_id = customer.organization_id + return true if customer.organization_ids.include?(organization_id) + return true if customer.organization_id? && customer.organization_id == organization_id + self.organization_id = customer.organization_id ? customer.organization_id : customer.organization_ids[0] true end diff --git a/app/models/ticket/article.rb b/app/models/ticket/article.rb index a6442bc1d989..4e5a1449423e 100644 --- a/app/models/ticket/article.rb +++ b/app/models/ticket/article.rb @@ -238,16 +238,7 @@ def sanitizeable?(attribute, _value) def attributes_with_association_names attributes = super - attributes['attachments'] = [] - attachments.each do |attachment| - item = { - id: attachment['id'], - filename: attachment['filename'], - size: attachment['size'], - preferences: attachment['preferences'], - } - attributes['attachments'].push item - end + add_attachments_to_attributes(attributes) Ticket::Article.insert_urls(attributes) end @@ -266,16 +257,7 @@ def attributes_with_association_names def attributes_with_association_ids attributes = super - attributes['attachments'] = [] - attachments.each do |attachment| - item = { - id: attachment['id'], - filename: attachment['filename'], - size: attachment['size'], - preferences: attachment['preferences'], - } - attributes['attachments'].push item - end + add_attachments_to_attributes(attributes) if attributes['body'] && attributes['content_type'] =~ %r{text/html}i attributes['body'] = HtmlSanitizer.dynamic_image_size(attributes['body']) end @@ -284,6 +266,11 @@ def attributes_with_association_ids private + def add_attachments_to_attributes(attributes) + attributes['attachments'] = attachments.map(&:attributes_for_display) + attributes + end + # strip not wanted chars def check_subject return true if subject.blank? diff --git a/app/models/ticket/overviews.rb b/app/models/ticket/overviews.rb index 1ea3e41f4a72..e6d3cf62bb71 100644 --- a/app/models/ticket/overviews.rb +++ b/app/models/ticket/overviews.rb @@ -23,7 +23,12 @@ def self.all(data) if current_user.organization_id && current_user.organization.shared overview_filter.delete(:organization_shared) end - overviews = Overview.joins(:roles).left_joins(:users).where(overviews_roles: { role_id: role_ids }, overviews_users: { user_id: nil }, overviews: overview_filter).or(Overview.joins(:roles).left_joins(:users).where(overviews_roles: { role_id: role_ids }, overviews_users: { user_id: current_user.id }, overviews: overview_filter)).distinct('overview.id').order(:prio, :name) + if overview_filter.key?(:organization_shared) && current_user.organization_ids.any? + current_user.organizations.each do |org| + overview_filter.delete(:organization_shared) if org.shared + end + end + overviews = Overview.joins(:roles).left_joins(:users).where(overviews_roles: { role_id: role_ids }, overviews_users: { user_id: nil }, overviews: overview_filter).or(Overview.joins(:roles).left_joins(:users).where(overviews_roles: { role_id: role_ids }, overviews_users: { user_id: current_user.id }, overviews: overview_filter)).distinct('overview.id').order(:prio) return overviews end diff --git a/app/models/ticket/screen_options.rb b/app/models/ticket/screen_options.rb index de78b9015e26..4e7782516220 100644 --- a/app/models/ticket/screen_options.rb +++ b/app/models/ticket/screen_options.rb @@ -115,10 +115,13 @@ def self.attributes_to_change(params) group_agent_roles_ids = Role.joins(', roles_groups').where("roles.id = roles_groups.role_id AND roles_groups.access = 'full' AND roles_groups.group_id = ? AND roles.id IN (?)", group.id, agent_role_ids).pluck(:id) group_agent_role_user_ids = User.joins(:roles).where(roles: { id: group_agent_roles_ids }).pluck(:id) - User.where(id: group_agent_user_ids.concat(group_agent_role_user_ids).uniq, active: true).each do |user| - dependencies[:group_id][group.id][:owner_id].push user.id - next if agents[user.id] - agents[user.id] = true + User.where(id: group_agent_user_ids.concat(group_agent_role_user_ids).uniq, active: true).pluck(:id).each do |user_id| + dependencies[:group_id][group.id][:owner_id].push user_id + next if agents[user_id] + agents[user_id] = true + next if assets[:User] && assets[:User][user_id] + user = User.lookup(id: user_id) + next if !user assets = user.assets(assets) end diff --git a/app/models/ticket/search.rb b/app/models/ticket/search.rb index 7aa373a72bd1..7de4ad7d780b 100644 --- a/app/models/ticket/search.rb +++ b/app/models/ticket/search.rb @@ -2,6 +2,10 @@ module Ticket::Search extend ActiveSupport::Concern + included do + include HasSearchSortable + end + # methods defined here are going to extend the class, not the instance of it class_methods do @@ -84,6 +88,15 @@ def search_preferences(_current_user) }, limit: 15, offset: 100, + + # sort single column + sort_by: 'created_at', + order_by: 'asc', + + # sort multiple columns + sort_by: [ 'created_at', 'updated_at' ], + order_by: [ 'asc', 'desc' ], + full: false, ) @@ -106,6 +119,12 @@ def search(params) full = true end + # check sort + sort_by = search_get_sort_by(params, 'updated_at') + + # check order + order_by = search_get_order_by(params, 'desc') + # try search index backend if condition.blank? && SearchIndexBackend.enabled? query_extention = {} @@ -135,7 +154,7 @@ def search(params) query_extention['bool']['must'].push access_condition - items = SearchIndexBackend.search(query, limit, 'Ticket', query_extention, offset) + items = SearchIndexBackend.search(query, limit, 'Ticket', query_extention, offset, sort_by, order_by) if !full ids = [] items.each do |item| @@ -157,22 +176,25 @@ def search(params) # do query # - stip out * we already search for *query* - + + order_select_sql = search_get_order_select_sql(sort_by, order_by, 'tickets.updated_at') + order_sql = search_get_order_sql(sort_by, order_by, 'tickets.updated_at DESC') if query query.delete! '*' - tickets_all = Ticket.select('DISTINCT(tickets.id), tickets.created_at') + tickets_all = Ticket.select("DISTINCT(tickets.id), #{order_select_sql}") .where(access_condition) .where('(tickets.title LIKE ? OR tickets.number LIKE ? OR ticket_articles.body LIKE ? OR ticket_articles.from LIKE ? OR ticket_articles.to LIKE ? OR ticket_articles.subject LIKE ?)', "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%" ) .joins(:articles) - .order('tickets.created_at DESC') + .order(order_sql) .offset(offset) .limit(limit) else query_condition, bind_condition, tables = selector2sql(condition) - tickets_all = Ticket.select('DISTINCT(tickets.id), tickets.created_at') + tickets_all = Ticket.select("DISTINCT(tickets.id), #{order_select_sql}") .joins(tables) .where(access_condition) .where(query_condition, *bind_condition) - .order('tickets.created_at DESC') + .order(order_sql) .offset(offset) .limit(limit) end @@ -193,4 +215,5 @@ def search(params) tickets end end + end diff --git a/app/models/ticket/subject.rb b/app/models/ticket/subject.rb index 2516b0424ba9..d3267eda291a 100644 --- a/app/models/ticket/subject.rb +++ b/app/models/ticket/subject.rb @@ -6,7 +6,8 @@ module Ticket::Subject build new subject with ticket number in there ticket = Ticket.find(123) - result = ticket.subject_build('some subject', is_reply_true_false) + prefix_mode = :reply # :forward, nil + result = ticket.subject_build('some subject', prefix_mode) returns @@ -14,36 +15,25 @@ module Ticket::Subject =end - def subject_build(subject, is_reply = false) + def subject_build(subject, prefix_mode = nil) # clena subject - subject = subject_clean(subject) - - ticket_hook = Setting.get('ticket_hook') - ticket_hook_divider = Setting.get('ticket_hook_divider') - ticket_subject_re = Setting.get('ticket_subject_re') - - # none position - if Setting.get('ticket_hook_position') == 'none' - if is_reply && ticket_subject_re.present? - subject = "#{ticket_subject_re}: #{subject}" - end - return subject + subject_parts = [subject_clean(subject)] + + # add hook + case Setting.get('ticket_hook_position') + when 'left' + subject_parts.unshift subject_build_hook + when 'right' + subject_parts.push subject_build_hook end - # right position - if Setting.get('ticket_hook_position') == 'right' - if is_reply && ticket_subject_re.present? - subject = "#{ticket_subject_re}: #{subject}" - end - return "#{subject} [#{ticket_hook}#{ticket_hook_divider}#{number}]" - end + # add prefix + subject_parts + .unshift(subject_build_prefix(prefix_mode)) + .compact! - # left position - if is_reply && ticket_subject_re.present? - return "#{ticket_subject_re}: [#{ticket_hook}#{ticket_hook_divider}#{number}] #{subject}" - end - "[#{ticket_hook}#{ticket_hook_divider}#{number}] #{subject}" + subject_parts.join ' ' end =begin @@ -85,4 +75,24 @@ def subject_clean(subject) subject.strip! subject end + + private + + def subject_build_hook + ticket_hook = Setting.get('ticket_hook') + ticket_hook_divider = Setting.get('ticket_hook_divider') + + "[#{ticket_hook}#{ticket_hook_divider}#{number}]" + end + + def subject_build_prefix(prefix_mode) + prefix = case prefix_mode + when 'reply' + Setting.get('ticket_subject_re') + when 'forward' + Setting.get('ticket_subject_fwd') + end + + prefix.present? ? "#{prefix}:" : nil + end end diff --git a/app/models/transaction/trigger.rb b/app/models/transaction/trigger.rb index 5faab763db93..62304eeb312d 100644 --- a/app/models/transaction/trigger.rb +++ b/app/models/transaction/trigger.rb @@ -18,18 +18,24 @@ class Transaction::Trigger =end def initialize(item, params = {}) + puts "Trigger initialize" + puts item.pretty_inspect + puts params.pretty_inspect @item = item @params = params end def perform - + puts "Transaction::Trigger perform Setting", Setting.get('import_mode') + puts "Transaction::Trigger perform object", @item[:object] # return if we run import mode return if Setting.get('import_mode') return if @item[:object] != 'Ticket' ticket = Ticket.find_by(id: @item[:object_id]) + + puts "Transaction::Trigger perform ticket", ticket.pretty_inspect return if !ticket if @item[:article_id] article = Ticket::Article.find_by(id: @item[:article_id]) diff --git a/app/models/translation.rb b/app/models/translation.rb index f9ffc1a3f5e6..afd70a7adc64 100644 --- a/app/models/translation.rb +++ b/app/models/translation.rb @@ -342,46 +342,38 @@ def self.load_from_csv(locale_name, location, charset = 'UTF8') true end + def self.remote_translation_need_update?(raw, translations) + translations.each do |row| + next if row[1] != raw['locale'] + next if row[2] != raw['source'] + next if row[3] != raw['format'] + return false if row[4] == raw['target'] # no update if target is still the same + return false if row[4] != row[5] # no update if translation has already changed + return [true, Translation.find(row[0])] + end + [true, nil] + end + private_class_method def self.to_database(locale, data) - translations = Translation.where(locale: locale).all + translations = Translation.where(locale: locale).pluck(:id, :locale, :source, :format, :target, :target_initial).to_a ActiveRecord::Base.transaction do + translations_to_import = [] data.each do |translation_raw| - - # handle case insensitive sql - translation = nil - translations.each do |item| - next if item.format != translation_raw['format'] - next if item.source != translation_raw['source'] - translation = item - break - end - if translation - - # verify if update is needed - update_needed = false - translation_raw.each_key do |key| - - # if translation target has changes - next if translation_raw[key] == translation.target - - # do not update translations which are already changed by user - if translation.target == translation.target_initial - update_needed = true - break - end - end - if update_needed - translation.update!(translation_raw.symbolize_keys!) - translation.save - end + result = Translation.remote_translation_need_update?(translation_raw, translations) + next if result == false + next if result.class != Array + if result[1] + result[1].update!(translation_raw.symbolize_keys!) + result[1].save else - if !UserInfo.current_user_id - translation_raw['updated_by_id'] = 1 - translation_raw['created_by_id'] = 1 - end - Translation.create(translation_raw.symbolize_keys!) + translation_raw['updated_by_id'] = UserInfo.current_user_id || 1 + translation_raw['created_by_id'] = UserInfo.current_user_id || 1 + translations_to_import.push Translation.new(translation_raw.symbolize_keys!) end end + if translations_to_import.present? + Translation.import translations_to_import + end end end @@ -401,7 +393,7 @@ def self.load_from_csv(locale_name, location, charset = 'UTF8') private def set_initial - return true if target_initial + return true if target_initial.present? return true if target_initial == '' self.target_initial = target true diff --git a/app/models/user.rb b/app/models/user.rb index 3eb62b450d6c..50fa858eb5aa 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -17,13 +17,15 @@ class User < ApplicationModel has_and_belongs_to_many :organizations, after_add: :cache_update, after_remove: :cache_update, class_name: 'Organization' has_many :tokens, after_add: :cache_update, after_remove: :cache_update has_many :authorizations, after_add: :cache_update, after_remove: :cache_update - belongs_to :organization, inverse_of: :members + belongs_to :organization, class_name: 'Organization' - before_validation :check_name, :check_email, :check_login, :check_mail_delivery_failed, :ensure_uniq_email, :ensure_password, :ensure_roles, :ensure_identifier + before_validation :check_name, :check_email, :check_login, :ensure_uniq_email, :ensure_password, :ensure_roles, :ensure_identifier + before_validation :check_mail_delivery_failed, on: :update before_create :check_preferences_default, :validate_preferences, :validate_ooo, :domain_based_assignment, :set_locale before_update :check_preferences_default, :validate_preferences, :validate_ooo, :reset_login_failed, :validate_agent_limit_by_attributes, :last_admin_check_by_attribute after_create :avatar_for_email_check after_update :avatar_for_email_check + after_commit :update_caller_id before_destroy :destroy_longer_required_objects store :preferences @@ -120,6 +122,11 @@ def longname if organization name += " (#{organization.name})" end + elsif organization_ids.any? + organization = Organization.lookup(id: organization_ids[0]) + if organization + name += " (#{organization.name})" + end end name end @@ -360,19 +367,24 @@ def self.create_from_hash!(hash) next if local_url.blank? url = local_url end - create!( - login: hash['info']['nickname'] || hash['uid'], - firstname: hash['info']['name'], - email: hash['info']['email'], - image_source: hash['info']['image'], - web: url, - address: hash['info']['location'], - note: hash['info']['description'], - source: hash['provider'], - role_ids: role_ids, - updated_by_id: 1, - created_by_id: 1, - ) + begin + create!( + login: hash['info']['nickname'] || hash['uid'], + firstname: hash['info']['name'], + email: hash['info']['email'], + image_source: hash['info']['image'], + web: url, + address: hash['info']['location'], + note: hash['info']['description'], + source: hash['provider'], + role_ids: role_ids, + updated_by_id: 1, + created_by_id: 1, + ) + rescue => e + logger.error e + raise Exceptions::UnprocessableEntity, e.message + end end =begin @@ -532,10 +544,10 @@ def self.password_reset_new_token(username) return if username.blank? # try to find user based on login - user = User.find_by(login: username.downcase, active: true) + user = User.find_by(login: username.downcase.strip, active: true) # try second lookup with email - user ||= User.find_by(email: username.downcase, active: true) + user ||= User.find_by(email: username.downcase.strip, active: true) # check if email address exists return if !user @@ -829,57 +841,95 @@ def cache_delete Cache.delete(key) end - private +=begin - def check_name - if firstname.present? - firstname.strip! - end - if lastname.present? - lastname.strip! - end +try to find correct name - return true if firstname.present? && lastname.present? + [firstname, lastname] = User.name_guess('Some Name', 'some.name@example.com') - if (firstname.blank? && lastname.present?) || (firstname.present? && lastname.blank?) +=end - # "Lastname, Firstname" - used_name = firstname.presence || lastname - name = used_name.split(', ', 2) + def self.name_guess(string, email = nil) + return if string.blank? && email.blank? + string.strip! + firstname = '' + lastname = '' + + # "Lastname, Firstname" + if string.match?(',') + name = string.split(', ', 2) if name.count == 2 if name[0].present? - self.lastname = name[0] + lastname = name[0].strip end if name[1].present? - self.firstname = name[1] + firstname = name[1].strip end - return true + return [firstname, lastname] if firstname.present? || lastname.present? end + end - # "Firstname Lastname" - name = used_name.split(' ', 2) - if name.count == 2 - if name[0].present? - self.firstname = name[0] - end - if name[1].present? - self.lastname = name[1] - end - return true + # "Firstname Lastname" + if string =~ /^(((Dr\.|Prof\.)[[:space:]]|).+?)[[:space:]](.+?)$/i + if $1.present? + firstname = $1.strip + end + if $4.present? + lastname = $4.strip end + return [firstname, lastname] if firstname.present? || lastname.present? + end # -no name- "firstname.lastname@example.com" - elsif firstname.blank? && lastname.blank? && email.present? + if string.blank? && email.present? scan = email.scan(/^(.+?)\.(.+?)\@.+?$/) - if scan[0] + if scan[0].present? if scan[0][0].present? - self.firstname = scan[0][0].capitalize + firstname = scan[0][0].strip end if scan[0][1].present? - self.lastname = scan[0][1].capitalize + lastname = scan[0][1].strip end + return [firstname, lastname] if firstname.present? || lastname.present? end end + + nil + end + + def no_name? + firstname.blank? && lastname.blank? + end + + private + + def check_name + if firstname.present? + firstname.strip! + end + if lastname.present? + lastname.strip! + end + + return true if firstname.present? && lastname.present? + + if (firstname.blank? && lastname.present?) || (firstname.present? && lastname.blank?) + used_name = firstname.presence || lastname + (local_firstname, local_lastname) = User.name_guess(used_name, email) + + elsif firstname.blank? && lastname.blank? && email.present? + (local_firstname, local_lastname) = User.name_guess('', email) + end + + self.firstname = local_firstname if local_firstname.present? + self.lastname = local_lastname if local_lastname.present? + + if firstname.present? && firstname.match(/^[A-z]+$/) && (firstname.downcase == firstname || firstname.upcase == firstname) + firstname.capitalize! + end + if lastname.present? && lastname.match(/^[A-z]+$/) && (lastname.downcase == lastname || lastname.upcase == lastname) + lastname.capitalize! + end true end @@ -927,9 +977,8 @@ def check_login end def check_mail_delivery_failed - return true if !changes || !changes['email'] + return if email_change.blank? preferences.delete(:mail_delivery_failed) - true end def ensure_roles @@ -1022,18 +1071,18 @@ def last_admin_check_admin_count end def validate_agent_limit_by_attributes - return true if !Setting.get('system_agent_limit') + return true if Setting.get('system_agent_limit').blank? return true if !will_save_change_to_attribute?('active') return true if active != true return true if !permissions?('ticket.agent') ticket_agent_role_ids = Role.joins(:permissions).where(permissions: { name: 'ticket.agent', active: true }, roles: { active: true }).pluck(:id) count = User.joins(:roles).where(roles: { id: ticket_agent_role_ids }, users: { active: true }).distinct().count + 1 - raise Exceptions::UnprocessableEntity, 'Agent limit exceeded, please check your account settings.' if count > Setting.get('system_agent_limit') + raise Exceptions::UnprocessableEntity, 'Agent limit exceeded, please check your account settings.' if count > Setting.get('system_agent_limit').to_i true end def validate_agent_limit_by_role(role) - return true if !Setting.get('system_agent_limit') + return true if Setting.get('system_agent_limit').blank? return true if active != true return true if role.active != true return true if !role.with_permission?('ticket.agent') @@ -1056,11 +1105,14 @@ def validate_agent_limit_by_role(role) count += 1 end end - raise Exceptions::UnprocessableEntity, 'Agent limit exceeded, please check your account settings.' if count > Setting.get('system_agent_limit') + raise Exceptions::UnprocessableEntity, 'Agent limit exceeded, please check your account settings.' if count > Setting.get('system_agent_limit').to_i true end def domain_based_assignment + puts "domain_based_assignment" + puts email + puts organization_id return true if !email return true if organization_id begin @@ -1068,6 +1120,8 @@ def domain_based_assignment return true if !domain organization = Organization.find_by(domain: domain.downcase, domain_assignment: true) return true if !organization + puts "dba organization" + puts organization.inspect self.organization_id = organization.id rescue return true @@ -1113,15 +1167,16 @@ def avatar_for_email_check end def destroy_longer_required_objects - Authorization.where(user_id: id).destroy_all - Avatar.remove('User', id) - Cti::CallerId.where(user_id: id).destroy_all - Taskbar.where(user_id: id).destroy_all - Karma::ActivityLog.where(user_id: id).destroy_all - Karma::User.where(user_id: id).destroy_all - OnlineNotification.where(user_id: id).destroy_all - RecentView.where(created_by_id: id).destroy_all - UserDevice.remove(id) + ::Authorization.where(user_id: id).destroy_all + ::Avatar.remove('User', id) + ::Cti::CallerId.where(user_id: id).destroy_all + ::Taskbar.where(user_id: id).destroy_all + ::Karma::ActivityLog.where(user_id: id).destroy_all + ::Karma::User.where(user_id: id).destroy_all + ::OnlineNotification.where(user_id: id).destroy_all + ::RecentView.where(created_by_id: id).destroy_all + ::UserDevice.remove(id) + ::Token.where(user_id: id).destroy_all true end @@ -1152,4 +1207,16 @@ def reset_login_failed self.login_failed = 0 true end + + # When adding/removing a phone number from the User table, + # update caller ID table + # to adopt/orphan matching Cti::Logs accordingly + # (see https://github.com/zammad/zammad/issues/2057) + def update_caller_id + # skip if "phone" does not change, or changes like [nil, ""] + return if persisted? && !previous_changes[:phone]&.any?(&:present?) + return if destroyed? && phone.blank? + + Cti::CallerId.build(self) + end end diff --git a/app/models/user/assets.rb b/app/models/user/assets.rb index 7b5e63d94bd0..d161f7126ea9 100644 --- a/app/models/user/assets.rb +++ b/app/models/user/assets.rb @@ -25,7 +25,7 @@ module Assets def assets (data) app_model = User.to_app_model - + puts "User assets data", data[ app_model ].pretty_inspect if !data[ app_model ] data[ app_model ] = {} end @@ -70,7 +70,7 @@ def assets (data) next if !group data = group.assets(data) end - + puts "USER ASSETS local_attributes",local_attributes.pretty_inspect # get organizations local_attributes['organization_ids']&.each do |organization_id| next if data[:Organization] && data[:Organization][organization_id] @@ -78,19 +78,42 @@ def assets (data) next if !organization data = organization.assets(data) end - + # + # if local_attributes['organization_id'] + # if !data[:Organization] && !data[:Organization]&[local_attributes['organization_id']] + # organization = Organization.lookup(id: local_attributes['organization_id']) + # if organization + # data = organization.assets(data) + # end + # end + # end data[ app_model ][ id ] = local_attributes end + puts ">>> USER2 ASSETS", self.organization_id, local_attributes.pretty_inspect if local_attributes['login'] == "assets2@example.org" + puts ">>> DATA ASSETS", data.pretty_inspect if local_attributes['login'] == "assets2@example.org" # add organization + if self.organization_ids.any? + self.organization_ids.each do |org| + if !data[:Organization] || !data[:Organization][org] + organization = Organization.lookup(id: org) + if organization + data = organization.assets(data) + end + end + end + end + if self.organization_id if !data[:Organization] || !data[:Organization][self.organization_id] organization = Organization.lookup(id: self.organization_id) + puts "ORGANIZATION",organization.pretty_inspect if local_attributes['login'] == "assets2@example.org" if organization data = organization.assets(data) end end end + %w[created_by_id updated_by_id].each do |local_user_id| next if !self[ local_user_id ] next if data[ app_model ][ self[ local_user_id ] ] diff --git a/app/models/user/search.rb b/app/models/user/search.rb index 5474bd8f62bc..f8f1263671c4 100644 --- a/app/models/user/search.rb +++ b/app/models/user/search.rb @@ -4,6 +4,10 @@ class User module Search extend ActiveSupport::Concern + included do + include HasSearchSortable + end + # methods defined here are going to extend the class, not the instance of it class_methods do @@ -54,6 +58,14 @@ def search_preferences(current_user) current_user: user_model, role_ids: [1,2,3], permissions: ['ticket.agent'] + + # sort single column + sort_by: 'created_at', + order_by: 'asc', + + # sort multiple columns + sort_by: [ 'created_at', 'updated_at' ], + order_by: [ 'asc', 'desc' ], ) returns @@ -70,6 +82,12 @@ def search(params) offset = params[:offset] || 0 current_user = params[:current_user] + # check sort + sort_by = search_get_sort_by(params, 'updated_at') + + # check order + order_by = search_get_order_by(params, 'desc') + # enable search only for agents and admins return [] if !search_preferences(current_user) @@ -94,7 +112,7 @@ def search(params) } query_extention['bool']['must'].push access_condition end - items = SearchIndexBackend.search(query, limit, 'User', query_extention, offset) + items = SearchIndexBackend.search(query, limit, 'User', query_extention, offset, sort_by, order_by) users = [] items.each do |item| user = User.lookup(id: item[:id]) @@ -104,17 +122,19 @@ def search(params) return users end + order_sql = search_get_order_sql(sort_by, order_by, 'users.updated_at DESC') + # fallback do sql query # - stip out * we already search for *query* - query.delete! '*' users = if params[:role_ids] User.joins(:roles).where('roles.id' => params[:role_ids]).where( '(users.firstname LIKE ? OR users.lastname LIKE ? OR users.email LIKE ? OR users.login LIKE ?) AND users.id != 1', "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%" - ).order('updated_at DESC').offset(offset).limit(limit) + ).order(order_sql).offset(offset).limit(limit) else User.where( '(firstname LIKE ? OR lastname LIKE ? OR email LIKE ? OR login LIKE ?) AND id != 1', "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%" - ).order('updated_at DESC').offset(offset).limit(limit) + ).order(order_sql).offset(offset).limit(limit) end users end diff --git a/config/application.rb b/config/application.rb index 7b59d86f10c2..786ab124a43c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -47,6 +47,8 @@ class Application < Rails::Application 'observer::_sla::_ticket_rebuild_escalation', 'observer::_transaction' + config.active_job.queue_adapter = :delayed_job + # REST api path config.api_path = '/api/v1' diff --git a/config/environments/development.rb b/config/environments/development.rb index 90b61895d29e..cdb296b421f7 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -31,8 +31,9 @@ #config.assets.debug = true config.assets.debug = false - if defined?(Rack::LiveReload) - # Automatically inject JavaScript needed for LiveReload + # Automatically inject JavaScript needed for LiveReload + if ENV['RAKE_LIVE_RELOAD'].present? + require 'rack-livereload' config.middleware.insert_after( ActionDispatch::Static, Rack::LiveReload, diff --git a/config/routes/auth.rb b/config/routes/auth.rb index b6fc7a6eaf20..92aa9fdd583e 100644 --- a/config/routes/auth.rb +++ b/config/routes/auth.rb @@ -3,6 +3,7 @@ # omniauth match '/auth/:provider/callback', to: 'sessions#create_omniauth', via: %i[post get puts delete] + match '/auth/failure', to: 'sessions#failure_omniauth', via: %i[post get] # sso match '/auth/sso', to: 'sessions#create_sso', via: %i[post get] diff --git a/config/routes/user.rb b/config/routes/user.rb index c453d4e15a09..a8fb0c5df251 100644 --- a/config/routes/user.rb +++ b/config/routes/user.rb @@ -3,7 +3,6 @@ # users match api_path + '/users/search', to: 'users#search', via: %i[get post option] - match api_path + '/users/recent', to: 'users#recent', via: %i[get post] match api_path + '/users/password_reset', to: 'users#password_reset_send', via: :post match api_path + '/users/password_reset_verify', to: 'users#password_reset_verify', via: :post match api_path + '/users/password_change', to: 'users#password_change', via: :post @@ -25,8 +24,8 @@ match api_path + '/users/:id', to: 'users#show', via: :get match api_path + '/users/history/:id', to: 'users#history', via: :get match api_path + '/users', to: 'users#create', via: :post - match api_path + '/users/:id', to: 'users#update', via: :put - match api_path + '/users/:id', to: 'users#destroy', via: :delete + match api_path + '/users/:id', to: 'users#update', via: :put, as: 'api_v1_update_user' + match api_path + '/users/:id', to: 'users#destroy', via: :delete, as: 'api_v1_delete_user' match api_path + '/users/image/:hash', to: 'users#image', via: :get match api_path + '/users/email_verify', to: 'users#email_verify', via: :post diff --git a/contrib/nginx/zammad_ssl.conf b/contrib/nginx/zammad_ssl.conf index 331f74c61638..bc973ed86b65 100644 --- a/contrib/nginx/zammad_ssl.conf +++ b/contrib/nginx/zammad_ssl.conf @@ -1,13 +1,14 @@ # -# this is an example nginx config for zammad with free letsencrypt.org ssl certificates -# replace all occurrences of example.com with your domain -# create letsencrypt certificate by: certbot certonly --webroot -w /var/www/html -d www.example.com +# this is an example nginx config for using SSL with zammad +# this can be adjusted to be used with self-signed, trusted ca and letsencrypt certs +# this example uses letsencrypt certs. replace all occurrences of example.com with your domain +# If using LetsEncrypt create letsencrypt certificate by: certbot certonly --webroot -w /var/www/html -d www.example.com # create dhparam.pem by: openssl dhparam -out /etc/nginx/ssl/dhparam.pem 4096 -# download x3 certificate by: wget -q https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.pem -P /etc/nginx/ssl +# download LetsEncrypt x3 certificate by: wget -q https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.pem -P /etc/nginx/ssl # you can test your ssl configuration @ https://www.ssllabs.com/ssltest/analyze.html # -upstream zammad { +upstream zammad-railsserver { server localhost:3000; } @@ -17,70 +18,33 @@ upstream zammad-websocket { server { listen 80; - listen [::]:80; - server_name example.com www.example.com; + server_name example.com; - access_log /var/log/nginx/example.com.access.log; - error_log /var/log/nginx/example.com.error.log; + access_log /var/log/nginx/zammad.access.log; + error_log /var/log/nginx/zammad.error.log; location /.well-known/ { root /var/www/html; } location / { - rewrite ^/(.*)$ https://www.example.com/$1 permanent; + rewrite ^/(.*)$ https://example.com/$1 permanent; } } server { listen 443 ssl http2; - listen [::]:443 ssl http2; server_name example.com; ssl_certificate /etc/nginx/ssl/example.com-fullchain.pem; ssl_certificate_key /etc/nginx/ssl/example.com-privkey.pem; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - - ssl_ciphers HIGH:!aNULL:!MD5; - - ssl_dhparam /etc/nginx/ssl/dhparam.pem; - - ssl_prefer_server_ciphers on; - - ssl_session_cache shared:SSL:10m; - ssl_session_timeout 180m; - - ssl_stapling on; - ssl_stapling_verify on; - - ssl_trusted_certificate /etc/nginx/ssl/lets-encrypt-x3-cross-signed.pem; - - resolver 8.8.8.8 8.8.4.4; - - add_header Strict-Transport-Security "max-age=31536000" always; - - access_log /var/log/nginx/example.com.access.log; - error_log /var/log/nginx/example.com.error.log; - - rewrite ^/(.*)$ https://www.example.com/$1 permanent; -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - - server_name www.example.com; - - ssl_certificate /etc/nginx/ssl/example.com-fullchain.pem; - ssl_certificate_key /etc/nginx/ssl/example.com-privkey.pem; - - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_protocols TLSv1.2; - ssl_ciphers HIGH:!aNULL:!MD5; + ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'; ssl_dhparam /etc/nginx/ssl/dhparam.pem; @@ -98,7 +62,7 @@ server { add_header Strict-Transport-Security "max-age=31536000" always; - location = /robots.txt { + location = /robots.txt { access_log off; log_not_found off; } @@ -108,8 +72,8 @@ server { root /opt/zammad/public; - access_log /var/log/nginx/example.com.access.log; - error_log /var/log/nginx/example.com.error.log; + access_log /var/log/nginx/zammad.access.log; + error_log /var/log/nginx/zammad.error.log; client_max_body_size 50M; @@ -123,7 +87,6 @@ server { proxy_set_header Connection "Upgrade"; proxy_set_header CLIENT_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; proxy_read_timeout 86400; proxy_pass http://zammad-websocket; } @@ -132,9 +95,8 @@ server { proxy_set_header Host $http_host; proxy_set_header CLIENT_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_read_timeout 300; - proxy_pass http://zammad; + proxy_read_timeout 180; + proxy_pass http://zammad-railsserver; gzip on; gzip_types text/plain text/xml text/css image/svg+xml application/javascript application/x-javascript application/json application/xml; diff --git a/contrib/packager.io/functions b/contrib/packager.io/functions index 5e68d8246269..92fdcd786d02 100644 --- a/contrib/packager.io/functions +++ b/contrib/packager.io/functions @@ -228,11 +228,17 @@ function create_webserver_config () { function setup_elasticsearch () { echo "# Configuring Elasticsearch..." + ES_CONNECTION="$(zammad run rails r "puts Setting.get('es_url')" 2>> /dev/null)" + + if [ -z "${ES_CONNECTION}" ]; then + ES_CONNECTION="http://127.0.0.1:9200" + fi + if [ -n "$(/usr/share/elasticsearch/bin/elasticsearch-plugin list | grep mapper-attachments)" ]; then REBUILD_ES_SEARCHINDEX="yes" - echo "# Deleting old zammad_production elasticsearch index..." - curl -XDELETE "${ES_CONNECTION:-http://127.0.0.1:9200}/zammad_production" + echo "# Deleting old elasticsearch index..." + zammad run rake searchindex:drop yes | /usr/share/elasticsearch/bin/elasticsearch-plugin -s remove mapper-attachments @@ -242,21 +248,29 @@ function setup_elasticsearch () { yes | /usr/share/elasticsearch/bin/elasticsearch-plugin -s install ingest-attachment - ${INIT_CMD} restart elasticsearch + if [ "${ES_CONNECTION}" == "http://127.0.0.1:9200" ]; then + ${INIT_CMD} restart elasticsearch + else + echo -e "\n It seems you're running an external Elasticsearch server on ${ES_CONNECTION}" + echo -e "Stopping local elasticsearch server..." + ${INIT_CMD} stop elasticsearch + echo -e "\n Please get sure to install the 'ingest-attachment' plugin on your Elasticsearch server by:" + echo -e "/usr/share/elasticsearch/bin/elasticsearch-plugin -s install ingest-attachment" + echo -e "\nAfter this you might need to rebuild the searchindex by:" + echo -e "zammad run rake searchindex:rebuild" + fi } function elasticsearch_searchindex_rebuild () { - zammad run rails r "Setting.set('es_url', \"${ES_CONNECTION:-http://127.0.0.1:9200}\")" + zammad run rails r "Setting.set('es_url', \"${ES_CONNECTION}\")" if [ "${REBUILD_ES_SEARCHINDEX}" == "yes" ]; then echo "# (Re)building Elasticsearch searchindex..." - nohup zammad run rake searchindex:rebuild &> ${ZAMMAD_DIR}/log/searchindex-rebuild.log & fi } function update_or_install () { - setup_elasticsearch if [ -f ${ZAMMAD_DIR}/config/database.yml ]; then update_database @@ -279,6 +293,8 @@ function update_or_install () { initialise_database fi + setup_elasticsearch + elasticsearch_searchindex_rebuild } diff --git a/db/migrate/20120101000001_create_base.rb b/db/migrate/20120101000001_create_base.rb index c1085a7ef26f..8f1f6fbda052 100644 --- a/db/migrate/20120101000001_create_base.rb +++ b/db/migrate/20120101000001_create_base.rb @@ -642,10 +642,14 @@ def up t.string :from_comment, limit: 250, null: true t.string :to, limit: 100, null: false t.string :to_comment, limit: 250, null: true + t.string :queue, limit: 250, null: true t.string :call_id, limit: 250, null: false t.string :comment, limit: 500, null: true - t.timestamp :start, limit: 3, null: true - t.timestamp :end, limit: 3, null: true + t.timestamp :initialized_at, limit: 3, null: true + t.timestamp :start_at, limit: 3, null: true + t.timestamp :end_at, limit: 3, null: true + t.integer :duration_waiting_time, null: true + t.integer :duration_talking_time, null: true t.boolean :done, null: false, default: true t.text :preferences, limit: 500.kilobytes + 1, null: true t.timestamps limit: 3, null: false diff --git a/db/migrate/20120101000010_create_ticket.rb b/db/migrate/20120101000010_create_ticket.rb index 9c16bf3d7b50..07ee6371d2b1 100644 --- a/db/migrate/20120101000010_create_ticket.rb +++ b/db/migrate/20120101000010_create_ticket.rb @@ -237,6 +237,7 @@ def up t.column :condition, :text, limit: 500.kilobytes + 1, null: false t.column :order, :string, limit: 2500, null: false t.column :group_by, :string, limit: 250, null: true + t.column :group_direction, :string, limit: 250, null: true t.column :organization_shared, :boolean, null: false, default: false t.column :out_of_office, :boolean, null: false, default: false t.column :view, :string, limit: 1000, null: false diff --git a/db/migrate/20180418140353_add_input_to_ticket_create.rb b/db/migrate/20180418140353_add_input_to_ticket_create.rb new file mode 100644 index 000000000000..da77655bd02f --- /dev/null +++ b/db/migrate/20180418140353_add_input_to_ticket_create.rb @@ -0,0 +1,47 @@ +class AddInputToTicketCreate < ActiveRecord::Migration[5.1] + def up + # return if it's a new setup + return if !Setting.find_by(name: 'system_init_done') + + ObjectManager::Attribute.add( + force: true, + object: 'Ticket', + name: 'organization_id', + display: 'Organization', + data_type: 'select_organization', + data_option: { + relation: 'Organization', + nulloption: false, + multiple: false, + null: false, + default: 0, + translate: true + }, + editable: false, + active: true, + + screens: { + create_middle: { + 'ticket.agent' => { + null: false, + default: 0, + item_class: 'column' + }, + 'ticket.customer' => { + null: false, + default: 0, + item_class: 'column' + }, + }, + }, + to_create: false, + to_migrate: false, + to_delete: false, + position: 45, + updated_by_id: 1, + created_by_id: 1, + ) + + Cache.clear + end +end diff --git a/db/migrate/20180426111843_change_object_manager_attributes.rb b/db/migrate/20180426111843_change_object_manager_attributes.rb new file mode 100644 index 000000000000..6592b31b35b8 --- /dev/null +++ b/db/migrate/20180426111843_change_object_manager_attributes.rb @@ -0,0 +1,88 @@ +class ChangeObjectManagerAttributes < ActiveRecord::Migration[5.1] + def change + return if !Setting.find_by(name: 'system_init_done') + + UserInfo.current_user_id = 1 + + ObjectManager::Attribute.add( + force: true, + object: 'User', + name: 'organization_id', + display: 'Primary Organization', + data_type: 'autocompletion_ajax', + data_option: { + multiple: false, + nulloption: true, + null: true, + relation: 'Organization', + item_class: 'formGroup--halfSize', + }, + editable: false, + active: true, + screens: { + signup: {}, + invite_agent: {}, + invite_customer: { + '-all-' => { + null: true, + }, + }, + edit: { + '-all-' => { + null: true, + }, + }, + view: { + '-all-' => { + shown: true, + }, + }, + }, + to_create: false, + to_migrate: false, + to_delete: false, + position: 900, + ) + + ObjectManager::Attribute.add( + force: true, + object: 'User', + name: 'organization_ids', + display: 'Alternative Organizations', + data_type: 'autocompletion_multiple_ajax', + data_option: { + multiple: true, + nulloption: true, + null: true, + relation: 'Organization', + item_class: 'formGroup--halfSize', + }, + editable: false, + active: true, + screens: { + signup: {}, + invite_agent: {}, + invite_customer: { + '-all-' => { + null: true, + }, + }, + edit: { + '-all-' => { + null: true, + }, + }, + view: { + '-all-' => { + shown: true, + }, + }, + }, + to_create: false, + to_migrate: false, + to_delete: false, + position: 900, + ) + + end +end diff --git a/db/migrate/20180518100316_email_forward_prefix_setting_issue_1730.rb b/db/migrate/20180518100316_email_forward_prefix_setting_issue_1730.rb new file mode 100644 index 000000000000..dec4b5cf0a43 --- /dev/null +++ b/db/migrate/20180518100316_email_forward_prefix_setting_issue_1730.rb @@ -0,0 +1,28 @@ +class EmailForwardPrefixSettingIssue1730 < ActiveRecord::Migration[5.1] + def up + # return if it's a new setup + return if !Setting.find_by(name: 'system_init_done') + + Setting.create_if_not_exists( + title: 'Ticket Subject Forward', + name: 'ticket_subject_fwd', + area: 'Email::Base', + description: 'The text at the beginning of the subject in an email forward, e. g. FWD.', + options: { + form: [ + { + display: '', + null: true, + name: 'ticket_subject_fwd', + tag: 'input', + }, + ], + }, + state: 'FWD', + preferences: { + permission: ['admin.channel_email'], + }, + frontend: false + ) + end +end diff --git a/db/migrate/20180709020509_add_group_direction_to_overviews.rb b/db/migrate/20180709020509_add_group_direction_to_overviews.rb new file mode 100644 index 000000000000..fba072601b23 --- /dev/null +++ b/db/migrate/20180709020509_add_group_direction_to_overviews.rb @@ -0,0 +1,8 @@ +class AddGroupDirectionToOverviews < ActiveRecord::Migration[5.1] + def change + # return if it's a new setup + return if !Setting.find_by(name: 'system_init_done') + + add_column :overviews, :group_direction, :string, limit: 250, null: true + end +end diff --git a/db/migrate/20180711080554_issue_2100_utf8_encode_http_logs.rb b/db/migrate/20180711080554_issue_2100_utf8_encode_http_logs.rb new file mode 100644 index 000000000000..cb25522e32c9 --- /dev/null +++ b/db/migrate/20180711080554_issue_2100_utf8_encode_http_logs.rb @@ -0,0 +1,11 @@ +class Issue2100Utf8EncodeHttpLogs < ActiveRecord::Migration[5.1] + def up + HttpLog.where('request LIKE :enctag OR response LIKE :enctag', enctag: '%content: !binary |%') + .limit(100_000) + .order(created_at: :desc) + .find_each do |log| + log.update(request: log.request.transform_values(&:utf8_encode), + response: log.response.transform_values(&:utf8_encode)) + end + end +end diff --git a/db/migrate/20180716060129_issue_2019_fix_double_domain_links_in_trigger_emails.rb b/db/migrate/20180716060129_issue_2019_fix_double_domain_links_in_trigger_emails.rb new file mode 100644 index 000000000000..a02c73a458e0 --- /dev/null +++ b/db/migrate/20180716060129_issue_2019_fix_double_domain_links_in_trigger_emails.rb @@ -0,0 +1,18 @@ +class Issue2019FixDoubleDomainLinksInTriggerEmails < ActiveRecord::Migration[5.1] + DOUBLE_DOMAIN_REGEX = %r{(?<=)} + + def up + return if !Setting.find_by(name: 'system_init_done') + + Trigger.where('perform LIKE ?', '%notification.email: %') + .find_each do |t| + email_response = t.perform['notification.email'] + next if email_response.blank? || !email_response['body']&.match(DOUBLE_DOMAIN_REGEX) + + email_response['body'] = email_response['body'].gsub(DOUBLE_DOMAIN_REGEX, '') + next if !t.perform_changed? + + t.save + end + end +end diff --git a/db/migrate/20180719033247_add_confidential_to_doorkeeper_application.rb b/db/migrate/20180719033247_add_confidential_to_doorkeeper_application.rb new file mode 100644 index 000000000000..4e209428ec61 --- /dev/null +++ b/db/migrate/20180719033247_add_confidential_to_doorkeeper_application.rb @@ -0,0 +1,12 @@ +class AddConfidentialToDoorkeeperApplication < ActiveRecord::Migration[5.1] + def change + return if ActiveRecord::Base.connection.column_exists?(:oauth_applications, :confidential) + add_column( + :oauth_applications, + :confidential, + :boolean, + null: false, + default: true # maintaining backwards compatibility: require secrets + ) + end +end diff --git a/db/migrate/20180420000001_setting_cti.rb b/db/migrate/20180809000001_cti_generic_api.rb similarity index 62% rename from db/migrate/20180420000001_setting_cti.rb rename to db/migrate/20180809000001_cti_generic_api.rb index 24968b377109..7b2494bc4a50 100644 --- a/db/migrate/20180420000001_setting_cti.rb +++ b/db/migrate/20180809000001_cti_generic_api.rb @@ -1,4 +1,4 @@ -class SettingCti < ActiveRecord::Migration[5.1] +class CtiGenericApi < ActiveRecord::Migration[5.1] def up # return if it's a new setup @@ -66,5 +66,23 @@ def up }, frontend: false ) + + add_column :cti_logs, :queue, :string, limit: 250, null: true if !column_exists?(:cti_logs, :queue) + add_column :cti_logs, :initialized_at, :string, limit: 250, null: true if !column_exists?(:cti_logs, :initialized_at) + add_column :cti_logs, :duration_waiting_time, :integer, null: true if !column_exists?(:cti_logs, :duration_waiting_time) + add_column :cti_logs, :duration_talking_time, :integer, null: true if !column_exists?(:cti_logs, :duration_talking_time) + + # fixes issue #2183 - Mysql2::Error: Invalid default value for 'start_at' + if ActiveRecord::Base.connection_config[:adapter] == 'mysql2' + # disable the MySQL strict_mode for the current connection + execute("SET sql_mode = ''") + + change_column_default :cti_logs, :start, '0000-00-00 00:00:00' + change_column_default :cti_logs, :end, '0000-00-00 00:00:00' + end + + rename_column :cti_logs, :start, :start_at + rename_column :cti_logs, :end, :end_at + end end diff --git a/db/migrate/20180830000001_setting_delivery_temporary_failed.rb b/db/migrate/20180830000001_setting_delivery_temporary_failed.rb new file mode 100644 index 000000000000..e1ed92dab7bc --- /dev/null +++ b/db/migrate/20180830000001_setting_delivery_temporary_failed.rb @@ -0,0 +1,19 @@ +class SettingDeliveryTemporaryFailed < ActiveRecord::Migration[5.1] + def up + + # return if it's a new setup + return if !Setting.find_by(name: 'system_init_done') + + Setting.create_if_not_exists( + title: 'Defines postmaster filter.', + name: '0955_postmaster_filter_bounce_delivery_temporary_failed', + area: 'Postmaster::PreFilter', + description: 'Defines postmaster filter to identify postmaster bounced - reopen ticket on permanent temporary failed.', + options: {}, + state: 'Channel::Filter::BounceDeliveryTemporaryFailed', + frontend: false + ) + + end + +end diff --git a/db/migrate/20180911064647_issue_2140_reset_ldap_config.rb b/db/migrate/20180911064647_issue_2140_reset_ldap_config.rb new file mode 100644 index 000000000000..4a2a94f20f03 --- /dev/null +++ b/db/migrate/20180911064647_issue_2140_reset_ldap_config.rb @@ -0,0 +1,15 @@ +class Issue2140ResetLdapConfig < ActiveRecord::Migration[5.1] + def up + # return if it's a new setup + return if !Setting.find_by(name: 'system_init_done') + + ldap_config = Setting.get('ldap_config') + + # finish if LDAP config isn't broken + ldap_config.to_json + rescue Encoding::UndefinedConversionError + ldap_config[:wizardData].delete(:backend_user_attributes) + + Setting.set('ldap_config', ldap_config) + end +end diff --git a/db/migrate/20180913000001_setting_add_system_bcc.rb b/db/migrate/20180913000001_setting_add_system_bcc.rb new file mode 100644 index 000000000000..9b97969642a4 --- /dev/null +++ b/db/migrate/20180913000001_setting_add_system_bcc.rb @@ -0,0 +1,19 @@ +class SettingAddSystemBcc < ActiveRecord::Migration[5.1] + def up + + # return if it's a new setup + return if !Setting.find_by(name: 'system_init_done') + + Setting.create_if_not_exists( + title: 'Bcc address for all outgoing emails', + name: 'system_bcc', + area: 'Email::Enhanced', + description: 'To archive all outgoing emails from Zammad to external, you can store a bcc email address here.', + options: {}, + state: '', + preferences: { online_service_disable: true }, + frontend: false + ) + end + +end diff --git a/db/migrate/20180913000002_permission_add_time_accounting.rb b/db/migrate/20180913000002_permission_add_time_accounting.rb new file mode 100644 index 000000000000..5776f63b89b0 --- /dev/null +++ b/db/migrate/20180913000002_permission_add_time_accounting.rb @@ -0,0 +1,17 @@ +class PermissionAddTimeAccounting < ActiveRecord::Migration[5.1] + def up + + # return if it's a new setup + return if !Setting.find_by(name: 'system_init_done') + + Permission.create_if_not_exists( + name: 'admin.time_accounting', + note: 'Manage %s', + preferences: { + translations: ['Time Accounting'] + }, + ) + + end + +end diff --git a/db/migrate/20180919000000_setting_update_pretty_date_format.rb b/db/migrate/20180919000000_setting_update_pretty_date_format.rb new file mode 100644 index 000000000000..c89703f12736 --- /dev/null +++ b/db/migrate/20180919000000_setting_update_pretty_date_format.rb @@ -0,0 +1,13 @@ +class SettingUpdatePrettyDateFormat < ActiveRecord::Migration[5.1] + def up + + # return if it's a new setup + return if !Setting.find_by(name: 'system_init_done') + + setting = Setting.find_by(name: 'pretty_date_format') + return if !setting + setting.options[:form][0][:options][:timestamp] = 'timestamp - e. g. "2018-08-30 14:30"' + setting.save! + end + +end diff --git a/db/seeds/object_manager_attributes.rb b/db/seeds/object_manager_attributes.rb index fd0f0df44e3b..eeff35f2318c 100644 --- a/db/seeds/object_manager_attributes.rb +++ b/db/seeds/object_manager_attributes.rb @@ -322,6 +322,45 @@ position: 900, ) +ObjectManager::Attribute.add( + force: true, + object: 'Ticket', + name: 'organization_id', + display: 'Organization', + data_type: 'select_organization', + data_option: { + relation: 'Organization', + nulloption: false, + multiple: false, + null: false, + default: 0, + translate: true + }, + editable: false, + active: true, + + screens: { + create_middle: { + 'ticket.agent' => { + null: false, + default: 0, + item_class: 'column' + }, + 'ticket.customer' => { + null: false, + default: 0, + item_class: 'column' + }, + }, + }, + to_create: false, + to_migrate: false, + to_delete: false, + position: 45, + updated_by_id: 1, + created_by_id: 1, +) + ObjectManager::Attribute.add( force: true, object: 'TicketArticle', @@ -788,11 +827,11 @@ ObjectManager::Attribute.add( force: true, object: 'User', - name: 'organization_id', - display: 'Organization', - data_type: 'autocompletion_ajax', + name: 'organization_ids', + display: 'Alternative Organizations', + data_type: 'autocompletion_multiple_ajax', data_option: { - multiple: false, + multiple: true, nulloption: true, null: true, relation: 'Organization', @@ -825,6 +864,46 @@ position: 900, ) +ObjectManager::Attribute.add( + force: true, + object: 'User', + name: 'organization_id', + display: 'Primary Organization', + data_type: 'autocompletion_ajax', + data_option: { + multiple: false, + nulloption: true, + null: true, + relation: 'Organization', + item_class: 'formGroup--halfSize', + }, + editable: false, + active: true, + screens: { + signup: {}, + invite_agent: {}, + invite_customer: { + '-all-' => { + null: true, + }, + }, + edit: { + '-all-' => { + null: true, + }, + }, + view: { + '-all-' => { + shown: true, + }, + }, + }, + to_create: false, + to_migrate: false, + to_delete: false, + position: 900, +) + ObjectManager::Attribute.add( force: true, object: 'User', diff --git a/db/seeds/permissions.rb b/db/seeds/permissions.rb index 78414279e25f..0c5212e297a0 100644 --- a/db/seeds/permissions.rb +++ b/db/seeds/permissions.rb @@ -45,6 +45,13 @@ translations: ['Text Modules'] }, ) +Permission.create_if_not_exists( + name: 'admin.time_accounting', + note: 'Manage %s', + preferences: { + translations: ['Time Accounting'] + }, +) Permission.create_if_not_exists( name: 'admin.macro', note: 'Manage %s', diff --git a/db/seeds/settings.rb b/db/seeds/settings.rb index 7166fa0d21bb..19f3d97ac994 100644 --- a/db/seeds/settings.rb +++ b/db/seeds/settings.rb @@ -191,6 +191,7 @@ options: { 'relative': 'relative - e. g. "2 hours ago" or "2 days and 15 minutes ago"', 'absolute': 'absolute - e. g. "Monday 09:30" or "Tuesday 23. Feb 14:20"', + 'timestamp': 'timestamp - e. g. "2018-08-30 14:30"', }, }, ], @@ -2308,6 +2309,28 @@ frontend: false ) +Setting.create_if_not_exists( + title: 'Ticket Subject Forward', + name: 'ticket_subject_fwd', + area: 'Email::Base', + description: 'The text at the beginning of the subject in an email forward, e. g. FWD.', + options: { + form: [ + { + display: '', + null: true, + name: 'ticket_subject_fwd', + tag: 'input', + }, + ], + }, + state: 'FWD', + preferences: { + permission: ['admin.channel_email'], + }, + frontend: false +) + Setting.create_if_not_exists( title: 'Sender Format', name: 'ticket_define_email_from', @@ -2532,6 +2555,17 @@ frontend: false ) +Setting.create_if_not_exists( + title: 'Bcc address for all outgoing emails', + name: 'system_bcc', + area: 'Email::Enhanced', + description: 'To archive all outgoing emails from Zammad to external, you can store a bcc email address here.', + options: {}, + state: '', + preferences: { online_service_disable: true }, + frontend: false +) + Setting.create_if_not_exists( title: 'API Token Access', name: 'api_token_access', @@ -3189,6 +3223,15 @@ state: 'Channel::Filter::BounceDeliveryPermanentFailed', frontend: false ) +Setting.create_if_not_exists( + title: 'Defines postmaster filter.', + name: '0955_postmaster_filter_bounce_delivery_temporary_failed', + area: 'Postmaster::PreFilter', + description: 'Defines postmaster filter to identify postmaster bounced - reopen ticket on permanent temporary failed.', + options: {}, + state: 'Channel::Filter::BounceDeliveryTemporaryFailed', + frontend: false +) Setting.create_if_not_exists( title: 'Defines postmaster filter.', name: '1000_postmaster_filter_database_check', diff --git a/lib/core_ext/string.rb b/lib/core_ext/string.rb index dd522da16cbc..3b11bce6a2b3 100644 --- a/lib/core_ext/string.rb +++ b/lib/core_ext/string.rb @@ -474,10 +474,15 @@ def utf8_encode(**options) end def utf8_encode!(**options) - return self if (encoding == Encoding::UTF_8) && valid_encoding? + return force_encoding('utf-8') if dup.force_encoding('utf-8').valid_encoding? - input_encoding = viable_encodings(try_first: options[:from]).first - return encode!('utf-8', input_encoding) if input_encoding.present? + viable_encodings(try_first: options[:from]).each do |enc| + begin + return encode!('utf-8', enc) + rescue EncodingError => e + Rails.logger.error { e.inspect } + end + end case options[:fallback] when :output_to_binary @@ -501,6 +506,7 @@ def viable_encodings(try_first: nil) [provided, original, detected] .compact .reject { |e| Encoding.find(e) == Encoding::ASCII_8BIT } + .reject { |e| Encoding.find(e) == Encoding::UTF_8 } .select { |e| force_encoding(e).valid_encoding? } .tap { force_encoding(original) } # clean up changes from previous line diff --git a/lib/event_buffer.rb b/lib/event_buffer.rb index 95dc34095478..b8db10e4f894 100644 --- a/lib/event_buffer.rb +++ b/lib/event_buffer.rb @@ -1,6 +1,7 @@ module EventBuffer def self.list(key) + puts "#=#= EventBuffer list", key if !Thread.current[:event_buffer] Thread.current[:event_buffer] = {} end @@ -8,6 +9,7 @@ def self.list(key) end def self.add(key, item) + puts "#=#= EventBuffer add", key if !Thread.current[:event_buffer] Thread.current[:event_buffer] = {} end @@ -18,6 +20,7 @@ def self.add(key, item) end def self.reset(key) + puts "#=#= EventBuffer RESET", key return if !Thread.current[:event_buffer] return if !Thread.current[:event_buffer][key] Thread.current[:event_buffer][key] = [] diff --git a/lib/external_credential/facebook.rb b/lib/external_credential/facebook.rb index 0c3afcc8dfb8..89546082fc76 100644 --- a/lib/external_credential/facebook.rb +++ b/lib/external_credential/facebook.rb @@ -7,13 +7,13 @@ def self.app_verify(params) def self.request_account_to_link(credentials = {}) external_credential = ExternalCredential.find_by(name: 'facebook') + raise Exceptions::UnprocessableEntity, 'No facebook app configured!' if !external_credential if !credentials[:application_id] credentials[:application_id] = external_credential.credentials['application_id'] end if !credentials[:application_secret] credentials[:application_secret] = external_credential.credentials['application_secret'] end - oauth = Koala::Facebook::OAuth.new( credentials[:application_id], credentials[:application_secret], diff --git a/lib/external_credential/twitter.rb b/lib/external_credential/twitter.rb index 8b9cfc9ef65c..41b6165e3310 100644 --- a/lib/external_credential/twitter.rb +++ b/lib/external_credential/twitter.rb @@ -7,6 +7,7 @@ def self.app_verify(params) def self.request_account_to_link(credentials = {}) external_credential = ExternalCredential.find_by(name: 'twitter') + raise Exceptions::UnprocessableEntity, 'No twitter app configured!' if !external_credential if !credentials[:consumer_key] credentials[:consumer_key] = external_credential.credentials['consumer_key'] end diff --git a/lib/html_sanitizer.rb b/lib/html_sanitizer.rb index a83892bf9d18..e72173785ff4 100644 --- a/lib/html_sanitizer.rb +++ b/lib/html_sanitizer.rb @@ -1,4 +1,5 @@ class HtmlSanitizer + LINKABLE_URL_SCHEMES = URI.scheme_list.keys.map(&:downcase) - ['mailto'] + ['tel'] =begin @@ -17,7 +18,10 @@ def self.strict(string, external = false) attributes_whitelist = Rails.configuration.html_sanitizer_attributes_whitelist css_properties_whitelist = Rails.configuration.html_sanitizer_css_properties_whitelist css_values_blacklist = Rails.application.config.html_sanitizer_css_values_backlist - classes_whitelist = ['js-signatureMarker'] + + # We whitelist yahoo_quoted because Yahoo Mail marks quoted email content using + #
and we rely on this class to identify quoted messages + classes_whitelist = ['js-signatureMarker', 'yahoo_quoted'] attributes_2_css = %w[width height] # remove html comments @@ -25,23 +29,14 @@ def self.strict(string, external = false) scrubber_link = Loofah::Scrubber.new do |node| - # check if text has urls which need to be clickable - if node&.name != 'a' && node.parent && node.parent.name != 'a' && (!node.parent.parent || node.parent.parent.name != 'a') - if node.class == Nokogiri::XML::Text - urls = [] - node.content.scan(%r{((http|https|ftp|tel)://.+?)([[:space:]]|\.[[:space:]]|,[[:space:]]|\.$|,$|\)|\(|$)}mxi).each do |match| - if match[0] - urls.push match[0].to_s.strip - end - end - node.content.scan(/(^|:|;|\s)(www\..+?)([[:space:]]|\.[[:space:]]|,[[:space:]]|\.$|,$|\)|\(|$)/mxi).each do |match| - if match[1] - urls.push match[1].to_s.strip - end - end - next if urls.blank? - add_link(node.content, urls, node) - end + # wrap plain-text URLs in tags + if node.is_a?(Nokogiri::XML::Text) && node.ancestors.map(&:name).exclude?('a') + urls = URI.extract(node.content, LINKABLE_URL_SCHEMES) + .map { |u| u.sub(/[,.]$/, '') } # URI::extract captures trailing dots/commas + .reject { |u| u.match?(/^[^:]+:$/) } # URI::extract will match, e.g., 'tel:' + + next if urls.blank? + add_link(node.content, urls, node) end # prepare links @@ -395,7 +390,7 @@ def self.sanitize_attachment_disposition(url) end uri.to_s - rescue URI::Error + rescue url end diff --git a/lib/import/exchange/folder.rb b/lib/import/exchange/folder.rb index 0cd5e2b759f8..186a40335464 100644 --- a/lib/import/exchange/folder.rb +++ b/lib/import/exchange/folder.rb @@ -5,6 +5,8 @@ class Exchange class Folder include ::Mixin::RailsLogger + DEFAULT_ROOTS = %i[root msgfolderroot publicfoldersroot].freeze + def initialize(connection) @connection = connection @lookup_map = {} @@ -27,49 +29,36 @@ def find(id) end def all - # request folders only if neccessary and store the result - @all ||= children(%i[root msgfolderroot publicfoldersroot]) + @all ||= children(*DEFAULT_ROOTS) end - def children(parent_identifiers) - parent_identifiers.each_with_object([]) do |parent_identifier, result| - - child_folders = request_children(parent_identifier) - - next if child_folders.blank? + def children(*parents) + return [] if parents.empty? - child_folder_ids = child_folders.collect(&:id) - child_folders += children(child_folder_ids) + direct_descendants = parents.map(&method(:request_children)) + .flatten.uniq.compact - result.concat(child_folders) - end + direct_descendants | children(*direct_descendants) end def display_path(folder) - display_name = folder.display_name - return display_name if !folder.parent_folder_id - - parent_folder = find(folder.parent_folder_id) - return display_name if !parent_folder - + display_name = folder.display_name.utf8_encode(fallback: :read_as_sanitized_binary) parent_folder = id_folder_map[folder.parent_folder_id] - return display_name if !parent_folder - # recursive - parent_folder_path = display_path(parent_folder) + return display_name if parent_folder.blank? - "#{parent_folder_path} -> #{display_name}" + "#{display_path(parent_folder)} -> #{display_name}" rescue Viewpoint::EWS::EwsError - folder.display_name + display_name end private - def request_children(parent_identifier) - @connection.folders(root: parent_identifier) + def request_children(parent) + parent = parent.id if parent.respond_to?(:id) # type coercion + @connection.folders(root: parent) rescue Viewpoint::EWS::EwsFolderNotFound => e - logger.warn(e) - nil + logger.warn(e) && return end end end diff --git a/lib/ldap/user.rb b/lib/ldap/user.rb index 4b228fb27a1d..0d39bb00a45d 100644 --- a/lib/ldap/user.rb +++ b/lib/ldap/user.rb @@ -120,38 +120,34 @@ def valid?(username, password) # #=> {:dn=>"dn (e. g. CN=Administrator,CN=Users,DC=domain,DC=tld)", ...} # # @return [Hash{Symbol=>String}] The available User attributes as key and the name and an example as value. - def attributes(filter: nil, base_dn: nil) - - filter ||= filter() + def attributes(custom_filter: nil, base_dn: nil) + @attributes ||= begin + attributes = {}.with_indifferent_access + lookup_counter = 0 - attributes = {} - known_attributes = BLACKLISTED.dup - lookup_counter = 1 + # collect sample attributes + @ldap.search(custom_filter || filter, base: base_dn) do |entry| + pre_merge_count = attributes.count - @ldap.search(filter, base: base_dn) do |entry| - new_attributes = entry.attribute_names - known_attributes + attributes.reverse_merge!(entry.to_h + .except(*BLACKLISTED) + .transform_values(&:first) + .compact) - if new_attributes.blank? - lookup_counter += 1 - # check max 50 entries with - # the same attributes in a row - break if lookup_counter == 50 - next + # check max 50 entries with the same attributes in a row + lookup_counter = (pre_merge_count < attributes.count ? 0 : lookup_counter.next) + break if lookup_counter >= 50 end - new_attributes.each do |attribute| - value = entry[attribute] - next if value.blank? - next if value[0].blank? - - example_value = value[0].force_encoding('UTF-8').utf8_encode(fallback: :read_as_sanitized_binary) - attributes[attribute] = "#{attribute} (e. g. #{example_value})" + # format sample values for presentation + attributes.each do |name, value| + attributes[name] = if value.encoding == Encoding.find('ascii-8bit') + "#{name} (binary data)" + else + "#{name} (e.g., #{value.utf8_encode})" + end end - - known_attributes.concat(new_attributes) - lookup_counter = 0 end - attributes end # The active filter of the instance. If none give on initialization an automatic lookup is performed. diff --git a/lib/notification_factory.rb b/lib/notification_factory.rb index 477a9994e22e..b7d92fcff2a1 100644 --- a/lib/notification_factory.rb +++ b/lib/notification_factory.rb @@ -1,4 +1,6 @@ module NotificationFactory + TEMPLATE_PATH_STRING = Rails.root.join('app', 'views', '%s', '%