From 6e44b5ae26fbd16b04d86dae69a2095c84af8b23 Mon Sep 17 00:00:00 2001 From: Michiel Beijen Date: Fri, 21 Oct 2016 17:44:35 +0200 Subject: [PATCH 1/6] Use https in links were possible --- README_Install_Mac.md | 4 +-- README_Install_Ubuntu.md | 1 - .../app/views/facebook/app_config.jst.eco | 4 +-- .../layout_ref/communication_overview.jst.eco | 18 ++++++------- .../layout_ref/merge_customer_view.jst.eco | 26 +++++++++---------- .../app/views/layout_ref/ticket_zoom.jst.eco | 18 ++++++------- .../app/views/twitter/app_config.jst.eco | 4 +-- db/seeds.rb | 6 ++--- .../maintenance_session_message_test.rb | 4 +-- test/unit/aaa_string_test.rb | 12 ++++----- 10 files changed, 48 insertions(+), 49 deletions(-) diff --git a/README_Install_Mac.md b/README_Install_Mac.md index 26ae55ff9..d3ce3a625 100644 --- a/README_Install_Mac.md +++ b/README_Install_Mac.md @@ -15,9 +15,9 @@ Get Zammad ---------- ````shell - test -d ~/zammad/ || mkdir ~/zammad + test -d ~/zammad/ || mkdir ~/zammad cd ~/zammad/ - curl -L -O http://zammad.org/zammad-latest.tar.bz2 | tar -xj + curl -L -O http://ftp.zammad.com/zammad-latest.tar.bz2 | tar -xj ```` Install Zammad diff --git a/README_Install_Ubuntu.md b/README_Install_Ubuntu.md index 9834c0837..93dc34a87 100644 --- a/README_Install_Ubuntu.md +++ b/README_Install_Ubuntu.md @@ -53,4 +53,3 @@ ### Restart nginx as root * exit * systemctl restart nginx - diff --git a/app/assets/javascripts/app/views/facebook/app_config.jst.eco b/app/assets/javascripts/app/views/facebook/app_config.jst.eco index d9098f3e0..625d9bd8c 100644 --- a/app/assets/javascripts/app/views/facebook/app_config.jst.eco +++ b/app/assets/javascripts/app/views/facebook/app_config.jst.eco @@ -1,6 +1,6 @@

- <%- @T('The tutorial on how to manage a %s is hosted on our [online documentation](http://zammad.org/documentation/channel/facebook).', 'Facebook App') %> + <%- @T('The tutorial on how to manage a %s is hosted on our [online documentation](https://zammad.org/documentation/channel/facebook).', 'Facebook App') %>

<%- @T('Enter your %s App Keys', 'Facebook') %>

@@ -26,4 +26,4 @@ -
\ No newline at end of file + diff --git a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco index 1b3e4cea5..f910cf9b1 100644 --- a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco @@ -7,7 +7,7 @@

Ticket Article

-
Welcome to Zammad! We want to entertain you and your whole family!
- Ticket# 10001 - erstellte 11.07.2014 + Ticket# 10001 - erstellte 11.07.2014
@@ -65,12 +65,12 @@ Welcome!
Thank you for installing Zammad.

-You will find updates and patches at http://zammad.org/. Online
-documentation is available at http://guides.zammad.org/. You can also
-use our forums at http://forums.zammad.org/
+You will find updates and patches at https://zammad.org/. Online
+documentation is available at https://zammad.org/documentation/. Get involved
+(discussions, contributing, ...) at https://zammad.org/participate.

Regards,
-The Zammad.org Project +The zammad.org Project
<%- @T('See more') %>
@@ -105,7 +105,7 @@ The Zammad -
+
@@ -189,7 +189,7 @@ Grüße, Peter
-
+
@@ -274,4 +274,4 @@ Oliver
-
\ No newline at end of file +
diff --git a/app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco b/app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco index 9f895684c..fc20562db 100644 --- a/app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco @@ -97,15 +97,15 @@
- You will find updates and patches at http://zammad.org/. Online + You will find updates and patches at https://zammad.org/. Online
- documentation is available at http://guides.zammad.org/. You can also + documentation is available at http://forums.zammad.org/ + get involved (discussions, contributing, ...) at https://zammad.org/participate.
@@ -121,7 +121,7 @@
- The Zammad.org Project + The zammad.org Project
@@ -625,7 +625,7 @@ - +
@@ -649,7 +649,7 @@ - +
@@ -677,7 +677,7 @@ - + @@ -717,7 +717,7 @@ - + @@ -896,7 +896,7 @@ - +
@@ -912,7 +912,7 @@ - +
@@ -932,7 +932,7 @@ - +
@@ -944,7 +944,7 @@ - +
@@ -954,4 +954,4 @@ - \ No newline at end of file + diff --git a/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco index 7d0bc2ac9..cc7c063e8 100644 --- a/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco @@ -27,7 +27,7 @@ -
Welcome to Zammad! We want to entertain you and your whole family!
- Ticket# 10001 - erstellte 11.07.2014 + Ticket# 10001 - erstellte 11.07.2014
@@ -86,12 +86,12 @@
Thank you for installing Zammad.

- You will find updates and patches at http://zammad.org/. Online
- documentation is available at http://guides.zammad.org/. You can also
- use our forums at http://forums.zammad.org/
+ You will find updates and patches at https://zammad.org/. Online
+ documentation is available at https://zammad.org/documentation/. Get involved
+ (discussions, contributing, ...) at https://zammad.org/participate.

Regards,
- The Zammad.org Project + The zammad.org Project
<%- @T('See more') %>
@@ -130,7 +130,7 @@
-
+
@@ -219,7 +219,7 @@
-
+
@@ -655,4 +655,4 @@
-
\ No newline at end of file +
diff --git a/app/assets/javascripts/app/views/twitter/app_config.jst.eco b/app/assets/javascripts/app/views/twitter/app_config.jst.eco index 2e243eb6b..92f322b9c 100644 --- a/app/assets/javascripts/app/views/twitter/app_config.jst.eco +++ b/app/assets/javascripts/app/views/twitter/app_config.jst.eco @@ -1,6 +1,6 @@

- <%- @T('The tutorial on how to manage a %s is hosted on our [online documentation](http://zammad.org/documentation/channel/twitter).', 'Twitter App') %> + <%- @T('The tutorial on how to manage a %s is hosted on our [online documentation](https://zammad.org/documentation/channel/twitter).', 'Twitter App') %>

<%- @T('Enter your %s App Keys', 'Twitter') %>

@@ -26,4 +26,4 @@
- \ No newline at end of file + diff --git a/db/seeds.rb b/db/seeds.rb index f6b45fe40..ea2a84be9 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -3029,9 +3029,9 @@ Ticket::Article.create( Thank you for choosing Zammad. -You will find updates and patches at http://zammad.org/. Online -documentation is available at http://zammad.org/documentation. Get -involved (discussions, contributing, ...) at http://zammad.org/participate. +You will find updates and patches at https://zammad.org/. Online +documentation is available at https://zammad.org/documentation. Get +involved (discussions, contributing, ...) at https://zammad.org/participate. Regards, diff --git a/test/browser/maintenance_session_message_test.rb b/test/browser/maintenance_session_message_test.rb index 5cde06359..3df03ae8f 100644 --- a/test/browser/maintenance_session_message_test.rb +++ b/test/browser/maintenance_session_message_test.rb @@ -6,8 +6,8 @@ class MaintenanceSessionMessageTest < TestCase string = rand(99_999_999_999_999_999).to_s title_html = "test #{string}" title_text = "test #{string}<\/b>" - message_html = "message 1äöüß #{string}\n\n\nhttp://zammad.org" - message_text = "message 1äöüß #{string}\n\n\nhttp://zammad.org" + message_html = "message 1äöüß #{string}\n\n\nhttps://zammad.org" + message_text = "message 1äöüß #{string}\n\n\nhttps://zammad.org" # check #1 browser1 = browser_instance diff --git a/test/unit/aaa_string_test.rb b/test/unit/aaa_string_test.rb index 9b1c3ec84..5cf69d3ea 100644 --- a/test/unit/aaa_string_test.rb +++ b/test/unit/aaa_string_test.rb @@ -129,10 +129,10 @@ class AaaStringTest < ActiveSupport::TestCase result = 'test' assert_equal(result, html.html2text) - html = "\n
Best Tool of the World + html = "\n
Best Tool of the World some other text
" - result = "[1] Best Tool of the Worldsome other text\n\n[1] http://zammad.org" + result = "[1] Best Tool of the Worldsome other text\n\n[1] https://zammad.org" assert_equal(result, html.html2text) html = " @@ -397,10 +397,10 @@ P.S.: You receive this e-mail because you are listed in our database as person w [1] http://www.teamviewer.example/en/company/unsubscribe.aspx?id=1009645&ident=xxx' assert_equal(result, html.html2text) - html = "

Dave and leaned her -days adam.
Maybe we -want any help me that.
Next morning charlie saw at their -father.
Well as though adam took out here. Melvin will be more money. + html = "

Dave and leaned her +days adam.
Maybe we +want any help me that.
Next morning charlie saw at their +father.
Well as though adam took out here. Melvin will be more money. Called him into this one last thing.
Men-----------------------
" result = 'Dave and leaned her days adam. From 857b9e7910b2c59e0d0a032d4ad2e4b675454c9b Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Sun, 23 Oct 2016 18:24:08 +0200 Subject: [PATCH 2/6] Ordered list always started with 1 --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 67a12c28f..e5738b326 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,6 @@ Getting Started --------------- 1. Install Zammad on your system - ``` root@shell> cd /opt/ root@shell> tar -xzf zammad-1.0.1.tar.gz @@ -22,7 +21,6 @@ Getting Started ``` 2. Install all dependencies - ``` zammad@shell> cd zammad zammad@shell> gem install bundler @@ -35,14 +33,12 @@ Getting Started ``` 3. Configure your databases - ``` zammad@shell> cp config/database.yml.dist config/database.yml zammad@shell> vi config/database.yml ``` 4. Initialize your database - ``` zammad@shell> export RAILS_ENV=production zammad@shell> rake db:create @@ -51,7 +47,6 @@ Getting Started ``` 5. Change directory to zammad (if needed) and start the web server: - ``` zammad@shell> rake assets:precompile zammad@shell> rails s -p 3000 # application web server @@ -61,4 +56,3 @@ Getting Started 6. Go to http://localhost:3000/#getting_started and you'll see: "Welcome to Zammad!", there you need to create your admin user and you need to invite other agents. - From c58a73f68421266cf6dec4bd42392992dd5d47ba Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sun, 23 Oct 2016 20:40:55 +0200 Subject: [PATCH 3/6] Fixed issue#277 - chat history wrong on app/page reload. --- app/models/chat/session.rb | 8 ++--- test/unit/chat_test.rb | 62 +++++++++++++++++++++++++++++++++++--- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/app/models/chat/session.rb b/app/models/chat/session.rb index 14d5a2d91..7f7b41e7b 100644 --- a/app/models/chat/session.rb +++ b/app/models/chat/session.rb @@ -41,7 +41,7 @@ class Chat::Session < ApplicationModel def position return if state != 'waiting' position = 0 - Chat::Session.where(state: 'waiting').order('created_at ASC').each { |chat_session| + Chat::Session.where(state: 'waiting').order(created_at: :asc).each { |chat_session| position += 1 break if chat_session.id == id } @@ -52,7 +52,7 @@ class Chat::Session < ApplicationModel chat_session = Chat::Session.find_by(session_id: session_id) return if !chat_session session_attributes = [] - Chat::Message.where(chat_session_id: chat_session.id).each { |message| + Chat::Message.where(chat_session_id: chat_session.id).order(created_at: :asc).each { |message| session_attributes.push message.attributes } session_attributes @@ -60,10 +60,10 @@ class Chat::Session < ApplicationModel def self.active_chats_by_user_id(user_id) actice_sessions = [] - Chat::Session.where(state: 'running', user_id: user_id).order('created_at ASC').each { |session| + Chat::Session.where(state: 'running', user_id: user_id).order(created_at: :asc).each { |session| session_attributes = session.attributes session_attributes['messages'] = [] - Chat::Message.where(chat_session_id: session.id).each { |message| + Chat::Message.where(chat_session_id: session.id).order(created_at: :asc).each { |message| session_attributes['messages'].push message.attributes } actice_sessions.push session_attributes diff --git a/test/unit/chat_test.rb b/test/unit/chat_test.rb index faab5a402..b94b16477 100644 --- a/test/unit/chat_test.rb +++ b/test/unit/chat_test.rb @@ -199,18 +199,64 @@ class ChatTest < ActiveSupport::TestCase assert_equal(6, agent_state[:seads_total]) assert_equal(true, agent_state[:active]) + chat_session6.user_id = agent1.id chat_session6.state = 'running' chat_session6.save + Chat::Message.create( + chat_session_id: chat_session6.id, + content: 'message 1', + created_by_id: agent1.id, + ) + sleep 1 + Chat::Message.create( + chat_session_id: chat_session6.id, + content: 'message 2', + created_by_id: agent1.id, + ) + sleep 1 + Chat::Message.create( + chat_session_id: chat_session6.id, + content: 'message 3', + created_by_id: agent1.id, + ) + sleep 1 + Chat::Message.create( + chat_session_id: chat_session6.id, + content: 'message 4', + created_by_id: nil, + ) + # check customer state - assert_equal('no_seats_available', chat.customer_state[:state]) - assert_equal(5, chat.customer_state[:queue]) + customer_state = chat.customer_state + assert_equal('no_seats_available', customer_state[:state]) + assert_equal(5, customer_state[:queue]) + + # customer chat state + customer_state = chat.customer_state(chat_session6.session_id) + assert_equal('reconnect', customer_state[:state]) + assert(customer_state[:session]) + assert_equal(Array, customer_state[:session].class) + assert_equal('message 1', customer_state[:session][0]['content']) + assert_equal('message 2', customer_state[:session][1]['content']) + assert_equal('message 3', customer_state[:session][2]['content']) + assert_equal('message 4', customer_state[:session][3]['content']) + assert_equal('Notification Agent1', customer_state[:agent][:name]) + assert_equal(nil, customer_state[:agent][:avatar]) # check agent1 state agent_state = Chat.agent_state_with_sessions(agent1.id) assert_equal(5, agent_state[:waiting_chat_count]) assert_equal(1, agent_state[:running_chat_count]) - assert_equal([], agent_state[:active_sessions]) + assert_equal(Array, agent_state[:active_sessions].class) + assert_equal(chat.id, agent_state[:active_sessions][0]['chat_id']) + assert_equal(agent1.id, agent_state[:active_sessions][0]['user_id']) + assert(agent_state[:active_sessions][0]['messages']) + assert_equal(Array, agent_state[:active_sessions][0]['messages'].class) + assert_equal('message 1', agent_state[:active_sessions][0]['messages'][0]['content']) + assert_equal('message 2', agent_state[:active_sessions][0]['messages'][1]['content']) + assert_equal('message 3', agent_state[:active_sessions][0]['messages'][2]['content']) + assert_equal('message 4', agent_state[:active_sessions][0]['messages'][3]['content']) assert_equal(0, agent_state[:seads_available]) assert_equal(6, agent_state[:seads_total]) assert_equal(true, agent_state[:active]) @@ -235,7 +281,15 @@ class ChatTest < ActiveSupport::TestCase agent_state = Chat.agent_state_with_sessions(agent1.id) assert_equal(5, agent_state[:waiting_chat_count]) assert_equal(1, agent_state[:running_chat_count]) - assert_equal([], agent_state[:active_sessions]) + assert_equal(Array, agent_state[:active_sessions].class) + assert_equal(chat.id, agent_state[:active_sessions][0]['chat_id']) + assert_equal(agent1.id, agent_state[:active_sessions][0]['user_id']) + assert(agent_state[:active_sessions][0]['messages']) + assert_equal(Array, agent_state[:active_sessions][0]['messages'].class) + assert_equal('message 1', agent_state[:active_sessions][0]['messages'][0]['content']) + assert_equal('message 2', agent_state[:active_sessions][0]['messages'][1]['content']) + assert_equal('message 3', agent_state[:active_sessions][0]['messages'][2]['content']) + assert_equal('message 4', agent_state[:active_sessions][0]['messages'][3]['content']) assert_equal(-2, agent_state[:seads_available]) assert_equal(4, agent_state[:seads_total]) assert_equal(true, agent_state[:active]) From 4128df989b2b84e999d42319fb8c44f105cb2f9f Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 24 Oct 2016 07:38:45 +0200 Subject: [PATCH 4/6] Moved to https urls. --- db/seeds.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index ea2a84be9..4250a6f7b 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5193,7 +5193,7 @@ Trigger.create_or_update(
Your #{config.product_name} Team

-
Zammad, your customer support system
', +
Zammad, your customer support system
', 'recipient' => 'ticket_customer', 'subject' => 'Thanks for your inquiry (#{ticket.title})', }, @@ -5232,7 +5232,7 @@ Trigger.create_or_update(
Your #{config.product_name} Team

-
Zammad, your customer support system
', +
Zammad, your customer support system
', 'recipient' => 'ticket_customer', 'subject' => 'Thanks for your follow up (#{ticket.title})', }, @@ -5260,7 +5260,7 @@ Trigger.create_or_update( #{config.http_type}://#{config.fqdn}/#ticket/zoom/#{ticket.id}


-

Zammad, your customer support system

', +

Zammad, your customer support system

', 'recipient' => 'ticket_customer', 'subject' => 'Owner has changed (#{ticket.title})', }, From 97238cc1420529d4d0069c3889b820787152bc9d Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 24 Oct 2016 07:47:05 +0200 Subject: [PATCH 5/6] Fixed unit test. --- test/unit/aaa_string_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/aaa_string_test.rb b/test/unit/aaa_string_test.rb index 5cf69d3ea..fe3b07f5e 100644 --- a/test/unit/aaa_string_test.rb +++ b/test/unit/aaa_string_test.rb @@ -400,7 +400,7 @@ P.S.: You receive this e-mail because you are listed in our database as person w html = "

Dave and leaned her days adam.
Maybe we want any help me that.
Next morning charlie saw at their -father.
Well as though adam took out here. Melvin will be more money. +father.
Well as though adam took out here. Melvin will be more money. Called him into this one last thing.
Men-----------------------
" result = 'Dave and leaned her days adam. From c15dd07bc4e87f7528ef3a718b900e695eae1909 Mon Sep 17 00:00:00 2001 From: Michiel Beijen Date: Mon, 24 Oct 2016 07:51:40 +0200 Subject: [PATCH 6/6] Add https url for download links --- README_Install_Mac.md | 2 +- README_Install_Ubuntu.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README_Install_Mac.md b/README_Install_Mac.md index d3ce3a625..ea62bc5fc 100644 --- a/README_Install_Mac.md +++ b/README_Install_Mac.md @@ -17,7 +17,7 @@ Get Zammad ````shell test -d ~/zammad/ || mkdir ~/zammad cd ~/zammad/ - curl -L -O http://ftp.zammad.com/zammad-latest.tar.bz2 | tar -xj + curl -L -O https://ftp.zammad.com/zammad-latest.tar.bz2 | tar -xj ```` Install Zammad diff --git a/README_Install_Ubuntu.md b/README_Install_Ubuntu.md index 93dc34a87..7e60c1908 100644 --- a/README_Install_Ubuntu.md +++ b/README_Install_Ubuntu.md @@ -14,7 +14,7 @@ ### Get Zammad * su zammad * cd ~ -* wget http://ftp.zammad.com/zammad-latest.tar.gz +* wget https://ftp.zammad.com/zammad-latest.tar.gz * tar -xzf zammad-latest.tar.gz * exit