From b7c3403e0e73d50841be2ecb673e64cca9ec1005 Mon Sep 17 00:00:00 2001
From: Thorsten Eckel <te@znuny.com>
Date: Mon, 29 Jun 2015 10:59:25 +0200
Subject: [PATCH] Added shorter/ical routes and made them defaults.

---
 .../app/views/profile/calendar_subscriptions.jst.eco        | 4 ++--
 config/routes/calendar_subscriptions.rb                     | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco b/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
index 9c2b2daa3..bc63f36d0 100644
--- a/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
+++ b/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
@@ -8,7 +8,7 @@
 <p><%= @T('See your tickets from within your favorite calendar by adding the following url to your calendar app.') %></p>
 
 <h3><%= @T('URL') %></h3>
-<input class="form-control js-select" readonly value="<%= @baseurl %>/calendar_subscriptions/tickets">
+<input class="form-control js-select" readonly value="<%= @baseurl %>/ical/tickets">
 
 <h3><%= @T('Subscription Settings') %></h3>
 <table class="settings-list">
@@ -25,7 +25,7 @@
       <td style="text-transform: capitalize"><%= @translationTable[stateType] %>
       <td><label class="inline-label"><input type="checkbox" name="<%= stateType %>/own"<%= if options.own then ' checked' %>> <%= @T('own tickets') %></label>
       <td><label class="inline-label"><input type="checkbox" name="<%= stateType %>/not_assigned"<%= if options.not_assigned then ' checked' %>> <%= @T('not assigned tickets') %></label>
-      <td><div class="btn btn--table btn--text js-showLink"><%= @T('Show') %></div><input class="form-control form-control--borderless js-select is-hidden" readonly value="<%= @baseurl %>/calendar_subscriptions/tickets/<%= stateType %>">
+      <td><div class="btn btn--table btn--text js-showLink"><%= @T('Show') %></div><input class="form-control form-control--borderless js-select is-hidden" readonly value="<%= @baseurl %>/ical/tickets/<%= stateType %>">
     </tr>
     <% end %>
   </tbody>
diff --git a/config/routes/calendar_subscriptions.rb b/config/routes/calendar_subscriptions.rb
index ef609e982..204d0da0e 100644
--- a/config/routes/calendar_subscriptions.rb
+++ b/config/routes/calendar_subscriptions.rb
@@ -1,5 +1,11 @@
 Zammad::Application.routes.draw do
 
+  # shorter version
+  match '/ical',                 to: 'calendar_subscriptions#all',    via: :get
+  match '/ical/:object',         to: 'calendar_subscriptions#object', via: :get
+  match '/ical/:object/:method', to: 'calendar_subscriptions#object', via: :get
+
+  # wording version
   match '/calendar_subscriptions',                 to: 'calendar_subscriptions#all',    via: :get
   match '/calendar_subscriptions/:object',         to: 'calendar_subscriptions#object', via: :get
   match '/calendar_subscriptions/:object/:method', to: 'calendar_subscriptions#object', via: :get