redmine_extensions 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 542371605ecd4f76aa7d45ab68a275df6995e882
-  data.tar.gz: 7e69634fd35a4005d4e7f1effecfdb621a69ad03
+  metadata.gz: 02335939730bf1db7ccbb7a0d39ce91a990b2658
+  data.tar.gz: bfcca9f09768aab46945dbf1389e8fe460f21513
 SHA512:
-  metadata.gz: ac2ef6ab15283e5d15d8c2c609d529067d0bee8d32d3ab9c41ef7a055d3b4b20b16be939770d2ff2fb94b1c1103bb7f25fea0b5ee59e1c0e8dadc8dc46986fd5
-  data.tar.gz: 1a2a7187ba205860232a8f6eee4c5c1d8973e8d6e66f56fac3b0b52645d012e2266d5e6fbada9528a15be1e6d8734aeb9026fbc3a7aac023a1671cbfe96bfc89
+  metadata.gz: a6f11b9495196b2b4f5d062ff3a7c1fab41564c04221fcc9a700aa63de9024b91f6fd4b3aaf9052062324ee5100a00c498c8112d85bddfd3ac5beebda4564fe8
+  data.tar.gz: e441ad3b2b6adc570556bb6475b02b4fffcd9c8fd1a71dba0722fba6f5332a00bee91dd1b617a7d43f54b8c93f51809fd08e8b079a3d27365a14d0f99b19cac1

data/Rakefile

@@ -38,12 +38,6 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.exclude_pattern = 'spec/redmine/**/*_spec.rb'
 end
 
-Rake::TestTask.new('redmine_test') do |t|
-  t.libs = ['spec/redmine/test']
-  t.pattern = 'spec/redmine/test/**/*_test.rb'
-  t.verbose = true
-end
-
 # task :redmine_test do |rake|
 #   Rake::Task['app:test'].invoke
 # end

data/app/assets/javascripts/redmine_extensions/jquery.entityarray.js

@@ -38,7 +38,7 @@
             }
 
             entity.element = $("<span/>")
-                .html(entity.name)
+                .text(entity.name)
                 .addClass(entity.className || this.options.className)
                 .appendTo(this.element)
                 .after(" ");

data/app/assets/javascripts/redmine_extensions/redmine_extensions.js

@@ -319,7 +319,7 @@ window.closeFlashMessage = (function($element){
             render_item: function(ul, item) {
                 return $("<li>")
                     .data("item.autocomplete", item)
-                    .append(item.label)
+                    .text(item.label)
                     .appendTo(ul);
             },
             activate_on_input_click: true,
@@ -529,7 +529,11 @@ window.closeFlashMessage = (function($element){
 
             this.loading = true;
             function successFce(json, status, xhr) {
-                data = that.options.rootElement ? json[that.options.rootElement] : json
+                var data = that.options.rootElement ? json[that.options.rootElement] : json
+                if( !data && window.console  ) {
+                    console.warn('Data could not be loaded! Please check the datasource.');
+                    data = [];
+                }
                 that._initData(data);
                 for (var i = that.afterLoaded.length - 1; i >= 0; i--) {
                     that.afterLoaded[i].call(that);

data/app/views/common/_closing_modal.html.erb

@@ -1,3 +1,3 @@
-<p>
-  <%= l(:text_modal_is_closing) %>
+<p>
+  <%= l(:text_modal_is_closing) %>
 </p>

data/app/views/common/close_modal.js.erb

@@ -1,5 +1,5 @@
-$("#ajax-modal").html("<%= j render(:partial => 'common/closing_modal', :formats => [:html]) %>");
-$("#ajax-modal").dialog('option', {
-  buttons: []
-});
+$("#ajax-modal").html("<%= j render(:partial => 'common/closing_modal', :formats => [:html]) %>");
+$("#ajax-modal").dialog('option', {
+  buttons: []
+});
 window.location = "<%= j params[:back_url] %>";

data/lib/generators/redmine_extensions/entity/templates/_sidebar.html.erb.erb

@@ -1,9 +1,9 @@
-<ul>
-<%% if @<%= model_name_underscored %> && !@<%= model_name_underscored %>.new_record? %>
-  <li><%%= link_to l(:button_edit), edit_polymorphic_path([@project, @<%= model_name_underscored %>]), title: l(:button_edit), class: 'icon icon-edit' %></li>
-<%% end %>
-<%% if @<%= model_name_underscored %>.nil? %>
-  <li><%%= link_to l(:button_<%= model_name_underscored %>_new), new_polymorphic_path([@project, :<%= model_name_underscored %>]), title: l(:title_<%= model_name_underscored %>_new), class: 'icon icon-add button button-positive' %></li>
-<%% end %>
-  <li><%%= link_to l(:label_<%= model_name_pluralize_underscored %>), polymorphic_path([@project, :<%= model_name_pluralize_underscored %>], set_filter: '1'), title: l(:label_<%= model_name_pluralize_underscored %>), class: 'icon icon-folder button' %></li>
+<ul>
+<%% if @<%= model_name_underscored %> && !@<%= model_name_underscored %>.new_record? %>
+  <li><%%= link_to l(:button_edit), edit_polymorphic_path([@project, @<%= model_name_underscored %>]), title: l(:button_edit), class: 'icon icon-edit' %></li>
+<%% end %>
+<%% if @<%= model_name_underscored %>.nil? %>
+  <li><%%= link_to l(:button_<%= model_name_underscored %>_new), new_polymorphic_path([@project, :<%= model_name_underscored %>]), title: l(:title_<%= model_name_underscored %>_new), class: 'icon icon-add button button-positive' %></li>
+<%% end %>
+  <li><%%= link_to l(:label_<%= model_name_pluralize_underscored %>), polymorphic_path([@project, :<%= model_name_pluralize_underscored %>], set_filter: '1'), title: l(:label_<%= model_name_pluralize_underscored %>), class: 'icon icon-folder button' %></li>
 </ul>

data/lib/generators/redmine_extensions/entity/templates/context_menu.html.erb.erb

@@ -1,8 +1,8 @@
-<ul>
-<%% if @<%= model_name_underscored %> -%>
-  <li><%%= context_menu_link l(:button_edit), edit_<%= model_name_underscored %>_path(@<%= model_name_underscored %>), class: 'icon icon-edit', disabled: !@can[:edit] %></li>
-<%% end %>
-  <li><%%= context_menu_link l(:button_delete), <%= model_name_pluralize_underscored %>_path(ids: @<%= model_name_underscored %>_ids, back_url: @back), method: :delete, data: {confirm: l(:text_are_you_sure)}, class: 'icon icon-del', disabled: !@can[:delete] %></li>
-
-  <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_context_menu_end, {<%= model_name_underscored %>: @<%= model_name_underscored %>, <%= model_name_pluralize_underscored %>: @<%= model_name_pluralize_underscored %>, can: @can, back: @back, project: @project}) %>
+<ul>
+<%% if @<%= model_name_underscored %> -%>
+  <li><%%= context_menu_link l(:button_edit), edit_<%= model_name_underscored %>_path(@<%= model_name_underscored %>), class: 'icon icon-edit', disabled: !@can[:edit] %></li>
+<%% end %>
+  <li><%%= context_menu_link l(:button_delete), <%= model_name_pluralize_underscored %>_path(ids: @<%= model_name_underscored %>_ids, back_url: @back), method: :delete, data: {confirm: l(:text_are_you_sure)}, class: 'icon icon-del', disabled: !@can[:delete] %></li>
+
+  <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_context_menu_end, {<%= model_name_underscored %>: @<%= model_name_underscored %>, <%= model_name_pluralize_underscored %>: @<%= model_name_pluralize_underscored %>, can: @can, back: @back, project: @project}) %>
 </ul>

data/lib/generators/redmine_extensions/entity/templates/custom_field.rb.erb

@@ -1,7 +1,7 @@
-class <%= model_name %>CustomField < CustomField
-
-  def type_name
-    :label_<%= @model_name_pluralize_underscored %>
-  end
-
-end
+class <%= model_name %>CustomField < CustomField
+
+  def type_name
+    :label_<%= @model_name_pluralize_underscored %>
+  end
+
+end

data/lib/generators/redmine_extensions/entity/templates/edit.html.erb.erb

@@ -1,19 +1,19 @@
-<%%= title l(:heading_<%= model_name_underscored %>_edit) %>
-
-<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr?}) do |f| %>
-  <%%= error_messages_for @<%= model_name_underscored %> %>
-
-  <div class="box">
-    <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
-  </div>
-
-  <%% if !request.xhr? %>
-  <p>
-    <%%= submit_tag l(:button_update), title: l(:button_update) %>
-  </p>
-  <%% end %>
-<%% end %>
-<%% ### PAGE CUSTOMS ########################################################## %>
-<%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%%= title l(:heading_<%= model_name_underscored %>_edit) %>
+
+<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr?}) do |f| %>
+  <%%= error_messages_for @<%= model_name_underscored %> %>
+
+  <div class="box">
+    <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
+  </div>
+
+  <%% if !request.xhr? %>
+  <p>
+    <%%= submit_tag l(:button_update), title: l(:button_update) %>
+  </p>
+  <%% end %>
+<%% end %>
+<%% ### PAGE CUSTOMS ########################################################## %>
+<%% content_for :sidebar do %>
+  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
 <%% end %>

data/lib/generators/redmine_extensions/entity/templates/edit.js.erb.erb

@@ -1,17 +1,17 @@
-$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/edit', :formats => [:html]) %>");
-showModal('ajax-modal');
-var submitButton = {
-  text:"<%=j l(:button_update) -%>",
-  title:"<%=j l(:button_update) -%>",
-  click: function() {$(this).find('form').submit()},
-  'class': 'button-positive'
-}
-var closeButton = {
-  text: "<%=j l(:button_close) -%>",
-  title: "<%=j l(:button_close) -%>",
-  click: function() {$(this).dialog('close');},
-  'class': 'button'
-}
-$("#ajax-modal").dialog('option', {
-  buttons: [closeButton, submitButton]
+$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/edit', :formats => [:html]) %>");
+showModal('ajax-modal');
+var submitButton = {
+  text:"<%=j l(:button_update) -%>",
+  title:"<%=j l(:button_update) -%>",
+  click: function() {$(this).find('form').submit()},
+  'class': 'button-positive'
+}
+var closeButton = {
+  text: "<%=j l(:button_close) -%>",
+  title: "<%=j l(:button_close) -%>",
+  click: function() {$(this).dialog('close');},
+  'class': 'button'
+}
+$("#ajax-modal").dialog('option', {
+  buttons: [closeButton, submitButton]
 });

data/lib/generators/redmine_extensions/entity/templates/index.api.rsb.erb

@@ -1,5 +1,5 @@
-api.array :<%= model_name_pluralize_underscored %>, api_meta(total_count: @entity_count, offset: @offset, limit: @limit) do
-  @entities.each do |<%= model_name_underscored %>|
-    render_api_<%= model_name_underscored %>(api, <%= model_name_underscored %>)
-  end
-end
+api.array :<%= model_name_pluralize_underscored %>, api_meta(total_count: @entity_count, offset: @offset, limit: @limit) do
+  @entities.each do |<%= model_name_underscored %>|
+    render_api_<%= model_name_underscored %>(api, <%= model_name_underscored %>)
+  end
+end

data/lib/generators/redmine_extensions/entity/templates/index.html.erb.erb

@@ -1,5 +1,5 @@
-<%%= render @query %>
-<%% ### PAGE CUSTOMS ########################################################## %>
-<%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%%= render @query %>
+<%% ### PAGE CUSTOMS ########################################################## %>
+<%% content_for :sidebar do %>
+  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
 <%% end %>

data/lib/generators/redmine_extensions/entity/templates/index.js.erb.erb

@@ -1,11 +1,11 @@
-$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/index', :formats => [:html]) %>");
-showModal('ajax-modal');
-var closeButton = {
-  text: "<%=j l(:button_close) -%>",
-  title: "<%=j l(:button_close) -%>",
-  click: function() {$(this).dialog('close');},
-  'class': 'button'
-}
-$("#ajax-modal").dialog('option', {
-  buttons: [closeButton, submitButton]
+$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/index', :formats => [:html]) %>");
+showModal('ajax-modal');
+var closeButton = {
+  text: "<%=j l(:button_close) -%>",
+  title: "<%=j l(:button_close) -%>",
+  click: function() {$(this).dialog('close');},
+  'class': 'button'
+}
+$("#ajax-modal").dialog('option', {
+  buttons: [closeButton, submitButton]
 });

data/lib/generators/redmine_extensions/entity/templates/mail_added.html.erb.erb

@@ -1 +1 @@
-<h1><%%= link_to(@<%= model_name_underscored %>.to_s, @<%= model_name_underscored %>_url) %></h1>
+<h1><%%= link_to(@<%= model_name_underscored %>.to_s, @<%= model_name_underscored %>_url) %></h1>

data/lib/generators/redmine_extensions/entity/templates/mail_added.text.erb.erb

@@ -1,2 +1,2 @@
-<%%= @<%= model_name_underscored %>.to_s %>
-<%%= @<%= model_name_underscored %>_url %>
+<%%= @<%= model_name_underscored %>.to_s %>
+<%%= @<%= model_name_underscored %>_url %>

data/lib/generators/redmine_extensions/entity/templates/mail_updated.text.erb.erb

@@ -1,2 +1,2 @@
-<%%= @<%= model_name_underscored %>.to_s %>
-<%%= @<%= model_name_underscored %>_url %>
+<%%= @<%= model_name_underscored %>.to_s %>
+<%%= @<%= model_name_underscored %>_url %>

data/lib/generators/redmine_extensions/entity/templates/migration.rb.erb

@@ -1,9 +1,9 @@
-class Create<%= model_name_pluralize_underscored.camelize %> < ActiveRecord::Migration
-  def change
-    create_table :<%= model_name_pluralize_underscored %>, force: true do |t|
-      <%- db_columns.each do |column_name, column_attrs| -%>
-      t.<%= column_attrs[:type] %> :<%= column_name %>, null: <%= column_attrs[:null] %>
-      <%- end -%>
-    end
-  end
-end
+class Create<%= model_name_pluralize_underscored.camelize %> < ActiveRecord::Migration
+  def change
+    create_table :<%= model_name_pluralize_underscored %>, force: true do |t|
+      <%- db_columns.each do |column_name, column_attrs| -%>
+      t.<%= column_attrs[:type] %> :<%= column_name %>, null: <%= column_attrs[:null] %>
+      <%- end -%>
+    end
+  end
+end

data/lib/generators/redmine_extensions/entity/templates/new.html.erb.erb

@@ -1,19 +1,19 @@
-<%%= title l(:heading_<%= model_name_underscored %>_new) %>
-
-<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr?}) do |f| %>
-  <%%= error_messages_for @<%= model_name_underscored %> %>
-
-  <div class="box">
-    <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
-  </div>
-
-  <%% if !request.xhr? %>
-  <p>
-    <%%= submit_tag l(:button_create), title: l(:button_create) %>
-  </p>
-  <%% end %>
-<%% end %>
-<%% ### PAGE CUSTOMS ########################################################## %>
-<%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%%= title l(:heading_<%= model_name_underscored %>_new) %>
+
+<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr?}) do |f| %>
+  <%%= error_messages_for @<%= model_name_underscored %> %>
+
+  <div class="box">
+    <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
+  </div>
+
+  <%% if !request.xhr? %>
+  <p>
+    <%%= submit_tag l(:button_create), title: l(:button_create) %>
+  </p>
+  <%% end %>
+<%% end %>
+<%% ### PAGE CUSTOMS ########################################################## %>
+<%% content_for :sidebar do %>
+  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
 <%% end %>

data/lib/generators/redmine_extensions/entity/templates/new.js.erb.erb

@@ -1,17 +1,17 @@
-$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/new', :formats => [:html]) %>");
-showModal('ajax-modal');
-var submitButton = {
-  text:"<%=j l(:button_create) -%>",
-  title:"<%=j l(:button_create) -%>",
-  click: function() {$(this).find('form').submit()},
-  'class': 'button-positive'
-}
-var closeButton = {
-  text: "<%=j l(:button_close) -%>",
-  title: "<%=j l(:button_close) -%>",
-  click: function() {$(this).dialog('close');},
-  'class': 'button'
-}
-$("#ajax-modal").dialog('option', {
-  buttons: [closeButton, submitButton]
+$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/new', :formats => [:html]) %>");
+showModal('ajax-modal');
+var submitButton = {
+  text:"<%=j l(:button_create) -%>",
+  title:"<%=j l(:button_create) -%>",
+  click: function() {$(this).find('form').submit()},
+  'class': 'button-positive'
+}
+var closeButton = {
+  text: "<%=j l(:button_close) -%>",
+  title: "<%=j l(:button_close) -%>",
+  click: function() {$(this).dialog('close');},
+  'class': 'button'
+}
+$("#ajax-modal").dialog('option', {
+  buttons: [closeButton, submitButton]
 });

data/lib/generators/redmine_extensions/entity/templates/routes.rb.erb

@@ -1,13 +1,13 @@
-<% if project? %>
-resources :projects do
-  resources :<%= model_name_pluralize_underscored %>
-end
-<% end %>
-resources :<%= model_name_pluralize_underscored %> do
-  collection do
-    get 'autocomplete'
-    get 'bulk_edit'
-    post 'bulk_update'
-    get 'context_menu'
-  end
+<% if project? %>
+resources :projects do
+  resources :<%= model_name_pluralize_underscored %>
+end
+<% end %>
+resources :<%= model_name_pluralize_underscored %> do
+  collection do
+    get 'autocomplete'
+    get 'bulk_edit'
+    post 'bulk_update'
+    get 'context_menu'
+  end
 end

data/lib/generators/redmine_extensions/entity/templates/show.html.erb.erb

@@ -1,38 +1,38 @@
-<%%= title @<%= model_name_underscored %> %>
-<div class="issue">
-  <table class="attributes">
-    <%%= issue_fields_rows do |rows| %>
-<%- safe_columns.each_with_index do |column, idx| -%>
-<%- next if description_column? && column[0] == description_column -%>
-<%- if idx % 2 == 0 -%>
-      <%% rows.left ::<%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
-<%- else -%>
-      <%% rows.right ::<%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
-<%- end -%>
-<%- end -%>
-    <%% end %>
-    <%%= render_custom_fields_rows(@<%= model_name_underscored %>) %>
-    <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_show_details_bottom, :<%= model_name_underscored %> => @<%= model_name_underscored %>) %>
-  </table>
-<%- if description_column? -%>
-  <%% if !@<%= model_name_underscored %>.<%= description_column %>.blank? %>
-    <hr />
-    <div class="description">
-      <p><strong><%%= ::<%= model_name %>.human_attribute_name(:<%= description_column %>) %></strong></p>
-      <div class="wiki">
-        <%%= textilizable @<%= model_name_underscored %>, :<%= description_column %>, attachments: @<%= model_name_underscored %>.attachments %>
-      </div>
-    </div>
-  <%% end %>
-<%- end -%>
-<%- if acts_as_attachable? -%>
-  <%% if @<%= model_name_underscored %>.attachments.any? -%>
-    <hr />
-    <%%= link_to_attachments @<%= model_name_underscored %>, :thumbnails => true %>
-  <%% end %>
-<%- end -%>
-</div>
-<%% ### PAGE CUSTOMS ########################################################## %>
-<%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%%= title @<%= model_name_underscored %> %>
+<div class="issue">
+  <table class="attributes">
+    <%%= issue_fields_rows do |rows| %>
+<%- safe_columns.each_with_index do |column, idx| -%>
+<%- next if description_column? && column[0] == description_column -%>
+<%- if idx % 2 == 0 -%>
+      <%% rows.left ::<%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
+<%- else -%>
+      <%% rows.right ::<%= model_name %>.human_attribute_name(:<%= column[0] %>), format_object(@<%= model_name_underscored %>.<%= column[0] %>) %>
+<%- end -%>
+<%- end -%>
+    <%% end %>
+    <%%= render_custom_fields_rows(@<%= model_name_underscored %>) %>
+    <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_show_details_bottom, :<%= model_name_underscored %> => @<%= model_name_underscored %>) %>
+  </table>
+<%- if description_column? -%>
+  <%% if !@<%= model_name_underscored %>.<%= description_column %>.blank? %>
+    <hr />
+    <div class="description">
+      <p><strong><%%= ::<%= model_name %>.human_attribute_name(:<%= description_column %>) %></strong></p>
+      <div class="wiki">
+        <%%= textilizable @<%= model_name_underscored %>, :<%= description_column %>, attachments: @<%= model_name_underscored %>.attachments %>
+      </div>
+    </div>
+  <%% end %>
+<%- end -%>
+<%- if acts_as_attachable? -%>
+  <%% if @<%= model_name_underscored %>.attachments.any? -%>
+    <hr />
+    <%%= link_to_attachments @<%= model_name_underscored %>, :thumbnails => true %>
+  <%% end %>
+<%- end -%>
+</div>
+<%% ### PAGE CUSTOMS ########################################################## %>
+<%% content_for :sidebar do %>
+  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
 <%% end %>