Merge branch 'develop' of github.com:martini/zammad into develop

app/controllers/organizations_controller.rb

@@ -177,7 +177,7 @@ Test:
   # GET /api/v1/organizations/history/1
   def history
 
-    # permissin check
+    # permission check
     if !role?(Z_ROLENAME_ADMIN) && !role?(Z_ROLENAME_AGENT)
       response_access_deny
       return

app/controllers/ticket_articles_controller.rb

@@ -124,7 +124,7 @@ class TicketArticlesController < ApplicationController
   # GET /ticket_attachment/1
   def attachment
 
-    # permissin check
+    # permission check
     ticket = Ticket.find( params[:ticket_id] )
     if !ticket_permission(ticket)
       render( json: 'No such ticket.', status: :unauthorized )
@@ -161,7 +161,7 @@ class TicketArticlesController < ApplicationController
   # GET /ticket_article_plain/1
   def article_plain
 
-    # permissin check
+    # permission check
     article = Ticket::Article.find( params[:id] )
     return if !ticket_permission( article.ticket )
 

app/controllers/tickets_controller.rb

@@ -7,7 +7,7 @@ class TicketsController < ApplicationController
   def show
     @ticket = Ticket.find( params[:id] )
 
-    # permissin check
+    # permission check
     return if !ticket_permission(@ticket)
 
     render json: @ticket
@@ -54,7 +54,7 @@ class TicketsController < ApplicationController
   def update
     ticket = Ticket.find(params[:id])
 
-    # permissin check
+    # permission check
     return if !ticket_permission(ticket)
 
     if ticket.update_attributes( Ticket.param_validation( params[:ticket] ) )
@@ -99,7 +99,7 @@ class TicketsController < ApplicationController
     # get ticket data
     ticket = Ticket.find( params[:id] )
 
-    # permissin check
+    # permission check
     return if !ticket_permission( ticket )
 
     # get history of ticket
@@ -171,7 +171,7 @@ class TicketsController < ApplicationController
       return
     end
 
-    # permissin check
+    # permission check
     return if !ticket_permission(ticket_master)
 
     # check slave ticket
@@ -184,7 +184,7 @@ class TicketsController < ApplicationController
       return
     end
 
-    # permissin check
+    # permission check
     return if !ticket_permission( ticket_slave )
 
     # check diffetent ticket ids
@@ -357,7 +357,7 @@ class TicketsController < ApplicationController
       fail 'Need user_id or organization_id as param'
     end
 
-    # permissin check
+    # permission check
     #return if !ticket_permission(ticket)
 
     # lookup open user tickets

app/controllers/users_controller.rb

@@ -387,7 +387,7 @@ class UsersController < ApplicationController
   # @response_message 401           Invalid session.
   def history
 
-    # permissin check
+    # permission check
     if !role?(Z_ROLENAME_ADMIN) && !role?('Agent')
       response_access_deny
       return