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 d84787352..786d6a9b7 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
@@ -634,7 +634,7 @@
-
Discard your unsaved changes.
+
Discard your unsaved changes.
\ No newline at end of file
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
new file mode 100644
index 000000000..213d6daf4
--- /dev/null
+++ b/app/assets/javascripts/app/views/ticket_zoom/attribute_bar.jst.eco
@@ -0,0 +1,14 @@
+
<%- @T('Discard your unsaved changes.') %>
+<% if @macroDisabled: %>
+
<%- @T('Update') %>
+<% else: %>
+
+<% end %>
\ No newline at end of file
diff --git a/app/controllers/macros_controller.rb b/app/controllers/macros_controller.rb
new file mode 100644
index 000000000..db0856694
--- /dev/null
+++ b/app/controllers/macros_controller.rb
@@ -0,0 +1,155 @@
+# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
+
+class MacrosController < ApplicationController
+ before_action :authentication_check
+
+=begin
+
+Format:
+JSON
+
+Example:
+{
+ "id":1,
+ "name":"some text_module",
+ "perform":{
+ "ticket.priority_id": 5,
+ "ticket.state_id": 2,
+ },
+ "active":true,
+ "updated_at":"2012-09-14T17:51:53Z",
+ "created_at":"2012-09-14T17:51:53Z",
+ "updated_by_id":2,
+ "created_by_id":2,
+}
+
+=end
+
+=begin
+
+Resource:
+GET /api/v1/macros.json
+
+Response:
+[
+ {
+ "id": 1,
+ "name": "some_name1",
+ ...
+ },
+ {
+ "id": 2,
+ "name": "some_name2",
+ ...
+ }
+]
+
+Test:
+curl http://localhost/api/v1/macros.json -v -u #{login}:#{password}
+
+=end
+
+ def index
+ model_index_render(Macro, params)
+ end
+
+=begin
+
+Resource:
+GET /api/v1/macros/#{id}.json
+
+Response:
+{
+ "id": 1,
+ "name": "name_1",
+ ...
+}
+
+Test:
+curl http://localhost/api/v1/macros/#{id}.json -v -u #{login}:#{password}
+
+=end
+
+ def show
+ model_show_render(Macro, params)
+ end
+
+=begin
+
+Resource:
+POST /api/v1/macros.json
+
+Payload:
+{
+ "name": "some name",
+ "perform":{
+ "ticket.priority_id": 5,
+ "ticket.state_id": 2,
+ },
+ "active":true,
+}
+
+Response:
+{
+ "id": 1,
+ "name": "some_name",
+ ...
+}
+
+Test:
+curl http://localhost/api/v1/macros.json -v -u #{login}:#{password} -H "Content-Type: application/json" -X POST -d '{"name": "some_name","active": true, "note": "some note"}'
+
+=end
+
+ def create
+ model_create_render(Macro, params)
+ end
+
+=begin
+
+Resource:
+PUT /api/v1/macros/{id}.json
+
+Payload:
+{
+ "name": "some name",
+ "perform":{
+ "ticket.priority_id": 5,
+ "ticket.state_id": 2,
+ },
+ "active":true,
+}
+
+Response:
+{
+ "id": 1,
+ "name": "some_name",
+ ...
+}
+
+Test:
+curl http://localhost/api/v1/macros.json -v -u #{login}:#{password} -H "Content-Type: application/json" -X PUT -d '{"name": "some_name","active": true, "note": "some note"}'
+
+=end
+
+ def update
+ model_update_render(Macro, params)
+ end
+
+=begin
+
+Resource:
+DELETE /api/v1/macros/{id}.json
+
+Response:
+{}
+
+Test:
+curl http://localhost/api/v1/macros.json -v -u #{login}:#{password} -H "Content-Type: application/json" -X DELETE
+
+=end
+
+ def destroy
+ model_destory_render(Macro, params)
+ end
+end
diff --git a/app/controllers/sessions/collection_ticket.rb b/app/controllers/sessions/collection_ticket.rb
index 63a5ea455..201ef3b1a 100644
--- a/app/controllers/sessions/collection_ticket.rb
+++ b/app/controllers/sessions/collection_ticket.rb
@@ -4,6 +4,10 @@ module ExtraCollection
def session( collections, assets, user )
# all ticket stuff
+ collections[ Macro.to_app_model ] = []
+ Macro.all.each {|item|
+ assets = item.assets(assets)
+ }
collections[ Ticket::StateType.to_app_model ] = []
Ticket::StateType.all.each {|item|
assets = item.assets(assets)
diff --git a/app/models/macro.rb b/app/models/macro.rb
new file mode 100644
index 000000000..a308cf61c
--- /dev/null
+++ b/app/models/macro.rb
@@ -0,0 +1,7 @@
+# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
+
+class Macro < ApplicationModel
+ store :perform
+ validates :name, presence: true
+
+end
diff --git a/config/routes/macro.rb b/config/routes/macro.rb
new file mode 100644
index 000000000..93f04c418
--- /dev/null
+++ b/config/routes/macro.rb
@@ -0,0 +1,11 @@
+Zammad::Application.routes.draw do
+ api_path = Rails.configuration.api_path
+
+ # macros
+ match api_path + '/macros', to: 'macros#index', via: :get
+ match api_path + '/macros/:id', to: 'macros#show', via: :get
+ match api_path + '/macros', to: 'macros#create', via: :post
+ match api_path + '/macros/:id', to: 'macros#update', via: :put
+ match api_path + '/macros/:id', to: 'macros#destroy', via: :delete
+
+end
diff --git a/db/migrate/20151015000001_create_macro.rb b/db/migrate/20151015000001_create_macro.rb
new file mode 100644
index 000000000..21214b7db
--- /dev/null
+++ b/db/migrate/20151015000001_create_macro.rb
@@ -0,0 +1,34 @@
+class CreateMacro < ActiveRecord::Migration
+ def up
+ create_table :macros do |t|
+ t.string :name, limit: 250, null: true
+ t.string :perform, limit: 5000, null: false
+ t.boolean :active, null: false, default: true
+ t.string :note, limit: 250, null: true
+ t.integer :updated_by_id, null: false
+ t.integer :created_by_id, null: false
+ t.timestamps null: false
+ end
+ add_index :macros, [:name], unique: true
+
+ UserInfo.current_user_id = 1
+ Macro.create_or_update(
+ name: 'Close & Tag as Spam',
+ perform: {
+ 'ticket.state_id': {
+ value: Ticket::State.find_by(name: 'closed').id,
+ },
+ 'ticket.tags': {
+ operator: 'add',
+ value: 'spam',
+ },
+ },
+ note: 'example macro',
+ active: true,
+ )
+ end
+
+ def down
+ drop_table :macros
+ end
+end
diff --git a/db/seeds.rb b/db/seeds.rb
index 920750e30..6bf34ec19 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1572,6 +1572,21 @@ Ticket::Article::Sender.create_if_not_exists( id: 1, name: 'Agent' )
Ticket::Article::Sender.create_if_not_exists( id: 2, name: 'Customer' )
Ticket::Article::Sender.create_if_not_exists( id: 3, name: 'System' )
+Macro.create_if_not_exists(
+ name: 'Close & Tag as Spam',
+ perform: {
+ 'ticket.state_id': {
+ value: Ticket::State.find_by(name: 'closed').id,
+ },
+ 'ticket.tags': {
+ operator: 'add',
+ value: 'spam',
+ },
+ },
+ note: 'example macro',
+ active: true,
+)
+
UserInfo.current_user_id = user_community.id
ticket = Ticket.create(
group_id: Group.where( name: 'Users' ).first.id,
diff --git a/lib/sessions/backend/collections/macro.rb b/lib/sessions/backend/collections/macro.rb
new file mode 100644
index 000000000..c62bb1122
--- /dev/null
+++ b/lib/sessions/backend/collections/macro.rb
@@ -0,0 +1,4 @@
+class Sessions::Backend::Collections::Macors < Sessions::Backend::Collections::Base
+ model_set 'Macro'
+ add_if_not_role 'Customer'
+end
diff --git a/public/assets/tests/form-extended.js b/public/assets/tests/form-extended.js
index c68906182..1e688067e 100644
--- a/public/assets/tests/form-extended.js
+++ b/public/assets/tests/form-extended.js
@@ -137,6 +137,10 @@ test( 'form checks', function() {
'ticket.priority_id': {
value: 3,
},
+ 'ticket.tags': {
+ operator: 'remove',
+ value: 'tag1, tag2',
+ },
},
}
new App.ControllerForm({
@@ -193,6 +197,10 @@ test( 'form checks', function() {
'ticket.priority_id': {
value: '3',
},
+ 'ticket.tags': {
+ operator: 'remove',
+ value: 'tag1, tag2',
+ },
},
working_hours: {
mon: {
@@ -328,6 +336,10 @@ test( 'form checks', function() {
'ticket.priority_id': {
value: '3',
},
+ 'ticket.tags': {
+ operator: 'remove',
+ value: 'tag1, tag2',
+ },
},
}
deepEqual( params, test_params, 'form param check' );
diff --git a/public/assets/tests/ui.js b/public/assets/tests/ui.js
index cb7297236..ae225d4d0 100644
--- a/public/assets/tests/ui.js
+++ b/public/assets/tests/ui.js
@@ -5,7 +5,10 @@ test( "check pretty date", function() {
// past
var result = App.PrettyDate.humanTime( current );
- equal( result, '0 minutes ago', 'right now')
+ equal( result, 'just now', 'just now')
+
+ result = App.PrettyDate.humanTime( current - 15000 );
+ equal( result, 'just now', 'just now')
result = App.PrettyDate.humanTime( current - 60000 );
equal( result, '1 minute ago', '1 min ago')
@@ -60,7 +63,10 @@ test( "check pretty date", function() {
// future
current = new Date()
result = App.PrettyDate.humanTime( current );
- equal( result, '0 minutes ago', 'right now')
+ equal( result, 'just now', 'just now')
+
+ result = App.PrettyDate.humanTime( current.getTime() + 55000 );
+ equal( result, 'just now', 'just now')
result = App.PrettyDate.humanTime( current.getTime() + 65000 );
equal( result, 'in 1 minute', 'in 1 min')