helpdesk 0.0.27 → 0.0.30

data/app/assets/stylesheets/helpdesk/application.css

@@ -8,9 +8,9 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
- *= require_self
+
  *= require_tree .
- *= require helpdesk/imports
  *= require helpdesk/admin/bootstrap_overrides
  *= require helpdesk/admin/tickets
+ *= require_self
 */

data/app/assets/stylesheets/helpdesk/tickets.css.sass

@@ -1,41 +1,29 @@
 
 body
+  div.panel-body
+    min-height: 400px
 
   form.feedback
-  
+
     > fieldset
       margin: 0px auto
       padding: 0px
       width: 500px
-      text-align: center
-      
-    
+
+
       > div
         clear: both
         display: block
-    
+
       div.subject input[type=text]
         float: left
         width: 350px
 
-
-
-      div.subject
-        select
-          float: right
-          margin: 0px
-          padding: 8px 3px
-          height: 34px
-          width: 110px
-          vertical-align: top
-          font-size: 13px
-      
-      
       div.content textarea
-    
+
       > div.content
         padding-top: 20px
-        
+
         textarea
           height: 100px
           width: 482px

data/app/controllers/helpdesk/admin/base_controller.rb

@@ -19,7 +19,7 @@ module Helpdesk
         end
 
         def my_tickets
-          @my_tickets = Ticket
+          @my_tickets = Helpdesk::Ticket
           .includes(:comments=>[:author])
           .includes(:requester)
           .includes(:assignee)

data/app/controllers/helpdesk/admin/dashboard_controller.rb

@@ -1,6 +1,6 @@
 class Helpdesk::Admin::DashboardController < Helpdesk::Admin::BaseController
 
       def index
-        #@tickets = Ticket.all
+        #@tickets = Helpdesk::Ticket.all
       end
 end

data/app/controllers/helpdesk/admin/faqs_controller.rb

@@ -2,7 +2,7 @@ class Helpdesk::Admin::FaqsController < Helpdesk::Admin::BaseController
 
   def sort
     params[:faqs].each_with_index do |id, index|
-      Helpdesk::Faq.update_all(['position=?', index+1], ['id=?', id])
+      Helpdesk::Faq.find(id).update_column(:position, index+1)
     end
     render :nothing => true
   end

data/app/controllers/helpdesk/admin/ticket_types_controller.rb

@@ -47,6 +47,6 @@ class Helpdesk::Admin::TicketTypesController < Helpdesk::Admin::BaseController
   private
 
   def ticket_type_params
-    params.require(:ticket_type).permit(:active,:position,:title,:tr_class,translations_attributes:[:title])
+    params.require(:ticket_type).permit(:active,:position,:title,:tr_class,translations_attributes:[:title, :id, :locale])
   end
 end

data/app/controllers/helpdesk/admin/tickets_controller.rb

@@ -1,21 +1,22 @@
 class Helpdesk::Admin::TicketsController < Helpdesk::Admin::BaseController
 
   def index
-    if params[:tickets] == 'unassigned'
-      @tickets = Helpdesk::Ticket.unassigned.scoped
-    elsif params[:tickets] == 'closed'
-      @tickets = Helpdesk::Ticket.closed.scoped
-    elsif params[:tickets] == 'active'
-      @tickets = Helpdesk::Ticket.active.scoped
-    elsif params[:tickets] == 'all'
-      @tickets = Helpdesk::Ticket.scoped
+    case params[:tickets]
+    when 'unassigned'
+      @tickets = Helpdesk::Ticket.unassigned
+    when'closed'
+      @tickets = Helpdesk::Ticket.closed
+    when 'active'
+      @tickets = Helpdesk::Ticket.active
+    when 'all'
+      @tickets = Helpdesk::Ticket
     else
       @tickets = my_tickets.active
     end
     @tickets = @tickets.includes(:requester)
-                        .includes(:assignee)
-                        .includes(:ticket_type)
-                        .page(params[:page])
+    .includes(:assignee)
+    .includes(:ticket_type)
+    .page(params[:page])
 
     render 'list'
   end
@@ -67,10 +68,10 @@ class Helpdesk::Admin::TicketsController < Helpdesk::Admin::BaseController
   end
 
 
-   private
+  private
 
-    def ticket_params
-      params.require(:ticket).permit(:status,:requester_id,:assignee_id,:ticket_type_id, :subject, :description,comments_attributes:[:author_id, :comment, :public])
-    end
+  def ticket_params
+    params.require(:ticket).permit(:status,:requester_id,:assignee_id,:ticket_type_id, :subject, :description,comments_attributes:[:author_id, :comment, :public])
+  end
 
 end

data/app/controllers/helpdesk/rooter_controller.rb

@@ -0,0 +1,16 @@
+module Helpdesk
+  class RooterController < Helpdesk::ApplicationController
+    def index
+      case Helpdesk.root_controller
+      when 'faqs'
+        redirect_to faqs_url
+      when 'tickets'
+        redirect_to tickets_url
+      when 'subscribers'
+        redirect_to subscribers_url
+      else
+        redirect_to faqs_url
+      end
+    end
+  end
+end

data/app/controllers/helpdesk/subscribers_controller.rb

@@ -2,8 +2,9 @@ module Helpdesk
   class SubscribersController < Helpdesk::ApplicationController
 
 
-    def new
+    def index
       @subscriber = Subscriber.new
+      @subscriber.lang = locale
 
       respond_to do |format|
         format.html # new.html.erb
@@ -25,21 +26,6 @@ module Helpdesk
       end
     end
 
-    # PUT /subscribers/1
-    # PUT /subscribers/1.json
-    def update
-      @subscriber = Subscriber.find(params[:id])
-
-      respond_to do |format|
-        if @subscriber.update_attributes(subscriber_params)
-          format.html { redirect_to @subscriber, notice: 'Subscriber was successfully updated.' }
-          format.json { head :no_content }
-        else
-          format.html { render action: "edit" }
-          format.json { render json: @subscriber.errors, status: :unprocessable_entity }
-        end
-      end
-    end
 
     # DELETE /subscribers/1
     # DELETE /subscribers/1.json

data/app/models/helpdesk/faq.rb

@@ -3,7 +3,7 @@ module Helpdesk
     translates :title, :text
     accepts_nested_attributes_for :translations
 
-    default_scope order('position ASC').includes(:translations)
+    default_scope {order('position ASC').includes(:translations)}
 
     scope :active,  -> {where(active:  true)}
     scope :inactive,  -> {where(active: false)}

data/app/models/helpdesk/subscriber.rb

@@ -1,7 +1,7 @@
 module Helpdesk
   class Subscriber < ActiveRecord::Base
-    scope :confirmed,  where('confirmed = ? ',true)
-    scope :unconfirmed,  where('confirmed = ? ',false)
+    scope :confirmed,  ->{ where('confirmed = ? ',true)}
+    scope :unconfirmed, ->{ where('confirmed = ? ',false)}
 
     validates_presence_of :email
 

data/app/views/helpdesk/admin/faqs/_form.html.haml

@@ -12,9 +12,9 @@
   - I18n.available_locales.each do |locale|
     %h1
       = locale
-      = f.globalize_fields_for locale do |g|
-        = g.input :title
-        = g.input :text, :as => :ckeditor, :input_html => { :ckeditor => {:width=>'100%',:height => 200,:toolbar => 'Full'} }
+    = f.globalize_fields_for locale do |g|
+      = g.input :title
+      = g.input :text, :as => :ckeditor, :input_html => { :ckeditor => {:width=>'100%',:height => 200,:toolbar => 'Full'} }
 
 
   = f.submit 'Save', :class=>'btn btn-primary'

data/app/views/helpdesk/admin/faqs/new.html.haml

@@ -1,6 +1,6 @@
 = render 'menu'
 - content_for :title do
-  New faq
+  New FAQ
 
 = render 'form'
 

data/app/views/helpdesk/admin/ticket_types/index.html.haml

@@ -11,6 +11,7 @@
 
 %table.table.table-hover
   %tr
+    %th Active
     %th Title
     %th
     %th
@@ -18,6 +19,7 @@
 
   - @ticket_types.each do |ticket_type|
     %tr{:class=>ticket_type.tr_class}
+      %td= ticket_type.active
       %td= ticket_type.title
       %td= link_to 'Show', admin_ticket_type_path(ticket_type)
       %td= link_to 'Edit', edit_admin_ticket_type_path(ticket_type)

data/app/views/helpdesk/subscribers/index.html.erb

@@ -1,31 +1,5 @@
-<h1>Listing subscribers</h1>
+<h1>New subscriber</h1>
 
-<table>
-  <tr>
-    <th>Name</th>
-    <th>Email</th>
-    <th>Lang</th>
-    <th>Hashcode</th>
-    <th>Confirmed</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
+<%= render 'form' %>
 
-<% @subscribers.each do |subscriber| %>
-  <tr>
-    <td><%= subscriber.send Helpdesk.display_user.to_sym %></td>
-    <td><%= subscriber.email %></td>
-    <td><%= subscriber.lang %></td>
-    <td><%= subscriber.hashcode %></td>
-    <td><%= subscriber.confirmed %></td>
-    <td><%= link_to 'Show', subscriber %></td>
-    <td><%= link_to 'Edit', edit_subscriber_path(subscriber) %></td>
-    <td><%= link_to 'Destroy', subscriber, confirm: 'Are you sure?', method: :delete %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'New Subscriber', new_admin_subscriber_path %>
+<%= link_to 'Back', subscribers_path %>

data/app/views/helpdesk/tickets/_form.html.haml

@@ -8,18 +8,13 @@
           - @ticket.errors.full_messages.each do |msg|
             %li
               = msg
-    / = f.input :subject
+    = f.input :subject
     / = f.input :ticket_type_id, collection: Helpdesk::TicketType.active, include_blank: false
-    %div.subject
-      %input{:value=>@ticket.subject,:name=>"ticket[subject]",:type => "text",:placeholder => t('helpdesk.tickets.subject')}
-      %select{:name=>"ticket[ticket_type_id]"}
-        - Helpdesk::TicketType.includes(:translations).all.each do |type|
-          %option{:value=>type.id, selected: type.id == @ticket.ticket_type_id}
-            = type.title
+    = f.input :ticket_type_id, collection: Helpdesk::TicketType.active.includes(:translations).all, include_blank: false
 
+    %hr
     - if @ticket.new_record?
-      %div.content
-        %textarea{:value=>@ticket.description,:name=>"ticket[description]",:type => "text",:placeholder => t('helpdesk.tickets.description')}
+      = f.input :description,:placeholder => t('helpdesk.tickets.description'),label:false, input_html:{rows:5}
     - else
       = @ticket.description
 

data/app/views/helpdesk/tickets/_ticket.html.haml

@@ -10,7 +10,7 @@
         - if ticket.requester
           = ticket.requester.send Helpdesk.display_user.to_sym
       %td{rowspan:2}
-        = status_label Helpdesk::Ticket::STATUS_BY_KEY[ticket.status.to_sym], Helpdesk::Ticket::STATUS_CLASS_BY_KEY[ticket.status.to_sym]
+        = status_label humanize_with_i18n(ticket.status,'helpdesk.tickets.statuses'), Helpdesk::Ticket::STATUS_CLASS_BY_KEY[ticket.status.to_sym]
         = ticket.ticket_type.title
 
         = auto_link(simple_format(ticket.description), :html => { :target => "_blank" })

data/app/views/helpdesk/tickets/index.html.haml

@@ -3,7 +3,7 @@
     = t('helpdesk.tickets.closed')
   -else
     = t('helpdesk.tickets.active')
-  ="(#{@tickets.total_count})"
+  ="(#{@tickets.count})"
 
 
 = render 'menu'

data/config/locales/helpdesk.pl.yml

@@ -110,6 +110,7 @@ pl:
         comment: Dodatkowy opis
         public: Widoczny/Wyślij
       helpdesk/ticket:
+        ticket_type: Rodzaj zgłoszenia
         requester_id: Zgłaszający
         subject: Temat
         status: Status

data/config/locales/helpdesk.pt-BR.yml

@@ -0,0 +1,110 @@
+pt-BR:
+
+  helpdesk:
+    lang: Idioma
+    Show: Detalhes
+    edit: Editar
+    Destroy: Deletar
+    name: Helpdesk
+    new_ticket: Novo
+    tickets:
+      new: Novo Chamado
+      my: Meu Chamado
+      unassigned: Não atribuido
+      closed: Chamados finalizados
+      all: Todos chamados
+      title: Chamados
+      active: Chamados ativos
+      assignee_to: Atribuido para
+      assign_me: Eu faço isso
+      not_assigned: Não atribuido
+      is_now_assigned: "Chamado %{subject} foi atribuido a você com sucesso"
+      visible_to_autor: Visivel para o autor - enviar um e-mail
+      you_have_no_tickets: "Sem chamados "
+      ticket_closed: Chamados finalizados
+      subject: Assunto
+      description: Conteúdo
+      cancel: cancelar
+      send: Enviar
+    ticket: Chamado
+    faq: FAQ
+    comments:
+      title: Comentários
+      note: Nota
+      send: Enviado
+      received: Recebido
+      note: note
+      author: Re. autor
+      helpdesk: Re.
+    ticket_types:
+      title: Tipos de chamados
+      new: Um novo tipo de chamado
+      all: Todos tipos de chamados
+      active: Tipos ativos de chamados
+      inactive: Tipos inativos de chamados
+
+    dashboard: Dashboard
+
+    subscribers:
+      title: Inscritos
+      confirmed: Inscrição confirmada
+      unconfirmed: Sem confirmação
+      all: Todos inscritos
+      new: Adcionar inscrito
+
+    faqs:
+      title: FAQ
+      active: Questões Ativas
+      inactive: Questões Inativas
+      all: Todas as questões
+      new: Nova questão
+      by: para
+      faq:
+        active: ativo
+        inactive: inativo
+
+    mailer:
+      comment_by_helpdesk_confirmation:
+        title: "Resposta para o chamado foi enviado"
+        re_ticket: "Novo comentário no chamado:"
+        response_content: "Conteúdo do comentário:"
+      comment_by_helpdesk_notification:
+        title: "%{user}, nova resposta recebida para o chamado:"
+        comment_content: "Conteúdo do comentário:"
+      comment_by_requester_notification:
+        title: "Nova resposta recebida para o chamado:"
+        comment_content: "Conteúdo do comentário:"
+      comment_by_requester_confirmation:
+        title: "%{user}, obrigado por enviar um comentário para o chamado"
+        subject: "Novo comentário para o chamado - %{subject}"
+        comment_content: "Conteúdo do comentário:"
+      ticket_created_confirmation:
+        title: "%{user}, obrigado por enviar"
+        subject: "O assunto do seu chamado é:"
+        ticket_content: "Conteúdo do chamado:"
+        info_time: "Obrigado pela solicitação, nós responderemos o mais breve possível."
+      ticket_created_notification:
+        title: "Novo chamado criado"
+        requester_info: "Autor"
+        ticket_content: "O conteúdo do chamado:"
+      ticket_url_title: "Segue link para verificar o andamento do seu chamado:"
+      footer_info: "Esta mensagem foi gerada automaticamente. Não responsa isso. Se você não iniciou uma solicitação de chamado, reporte a nós <a href=\"%{url}\"> clicando aqui </a>."
+      footer_nice: "Tenha um bom dia"
+
+  activerecord:
+    models:
+      Helpdesk: helpdesk
+      helpdesk/ticket: Chamado
+      helpdesk/comment: Comentário
+    attributes:
+      helpdesk/comment:
+        comment: Descrição adcional
+        public: Visivel/Enviar e-mail
+      helpdesk/ticket:
+        requester_id: Solicitante
+        subject: Assunto
+        Status: Status
+        assignee_id: Atribuído
+        ticket_type_id: Tipo da notificação
+        Description: Descrição
+        comments: Mais detalhes