Merge branch 'development'

Author: GEROMAX

README.md

@@ -7,16 +7,18 @@ This plugin provide on pop-up show feature of diff.
 ## Features
 
 * Add pop-up show feature on issue's history diff.
+* Add pop-up show feature on wiki's history diff.
 * Add switch of pop-up/default in user preferences.
 
 ## Compatibility
 
 Redmine 3.2 or 3.3 or 3.4 stable
 
 Tested on:
+
 * 3.2.2
-* 3.3.3
-* 3.4.2
+* 3.3.0
+* 3.4.3
 
 ## Installation
 

app/controllers/diff_popup_controller.rb

@@ -25,7 +25,7 @@ def journal_diff
     @diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value)
   end
 
-  private
+private
 
   def find_journal
     @journal = Journal.visible.find(params[:id])

app/controllers/wiki_popup_controller.rb

@@ -0,0 +1,43 @@
+class WikiPopupController < ApplicationController
+  unloadable
+  before_action :find_wiki, :authorize
+  before_action :find_existing_page, :only => [:wiki_diff]
+  
+  layout false
+
+  def wiki_diff
+    @diff = @page.diff(params[:version], params[:version_from])
+    render_404 unless @diff
+  end
+
+private
+
+  def find_wiki
+    @project = Project.find(params[:project_id])
+    @wiki = @project.wiki
+    render_404 unless @wiki
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
+  # Finds the requested page and returns a 404 error if it doesn't exist
+  def find_existing_page
+    @page = @wiki.find_page(params[:id])
+    if @page.nil?
+      render_404
+      return
+    end
+    if @wiki.page_found_with_redirect?
+      redirect_to_page @page
+    end
+  end
+
+  def redirect_to_page(page)
+    if page.project && page.project.visible?
+      redirect_to :action => action_name, :project_id => page.project, :id => page.title
+    else
+      render_404
+    end
+  end
+
+end

app/views/diff_popup/journal_diff.html.erb

@@ -1,6 +1,8 @@
-<p><%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %></p>
-<div style="text-align:right;">
-  <span class="diff_in"><%= l(:diff_popup_legend_add) %></span>&nbsp;<span class="diff_out"><%= l(:diff_popup_legend_remove) %></span>
+<div style="margin-top: 1em;margin-bottom: 1em;">
+  <%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %>
+  <div style="float:right;">
+    <span class="diff_in"><%= l(:diff_popup_legend_add) %></span>&nbsp;<span class="diff_out"><%= l(:diff_popup_legend_remove) %></span>
+  </div>
 </div>
 <div class="text-diff">
 <%= simple_format_without_paragraph @diff.to_html %>

app/views/issues/_issues_show_details_bottom_partial.html.erb

@@ -1,6 +1,6 @@
 <% if User.current.pref.enable_popup_journal_diff == '1' %>
 <%= content_for :header_tags do
-  javascript_include_tag("diff_popup", :plugin => "redmine_diff_popup")
+  javascript_include_tag('diff_popup', :plugin => 'redmine_diff_popup')
 end %>
 <script>
   $(function () {

app/views/layouts/_wiki_popup_content_partial.erb

@@ -0,0 +1,10 @@
+<% if User.current.pref.enable_popup_wiki_diff == '1' %>
+<%= hidden_field_tag 'project_id', @project.id %>
+<%= hidden_field_tag 'id', @page.title %>
+<%= button_tag l(:label_view_diff), :type => 'button', :class => 'small wiki-popup', :style => 'display:none;', :url => Redmine::Utils.relative_url_root + '/wiki_popup/wiki_diff?' %>
+<script>
+  $(function () {
+    replaceWikiSubmitButton();
+  });
+</script>
+<% end %>

app/views/layouts/_wiki_popup_html_head_partial.erb

@@ -0,0 +1,3 @@
+<% if User.current.pref.enable_popup_wiki_diff == '1' %>
+<%= javascript_include_tag('wiki_popup', :plugin => 'redmine_diff_popup') %>
+<% end %>

app/views/my/_diff_popup_preferences.erb

@@ -1,3 +1,4 @@
 <%= labelled_fields_for :pref, @user.pref do |pref_fields| %>
   <p><%= pref_fields.check_box :enable_popup_journal_diff %></p>
+  <p><%= pref_fields.check_box :enable_popup_wiki_diff %></p>
 <% end %>

app/views/wiki_popup/wiki_diff.html.erb

@@ -0,0 +1,21 @@
+<p class="wiki-popup-title" style="display:none;"><%= l(:label_history) %> <%= @diff.content_from.version %> - <%= @diff.content_to.version %></p>
+<div style="margin-top: 1em;margin-bottom: 1em;">
+<%= l(:label_version) %> <%= link_to @diff.content_from.version, :controller => "wiki", :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
+<em>(<%= @diff.content_from.author ?
+             @diff.content_from.author.name : l(:label_user_anonymous)
+      %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
+&#8594;
+<%= l(:label_version) %> <%= link_to @diff.content_to.version, :controller => "wiki", :action => 'show',
+                             :id => @page.title, :project_id => @page.project,
+                             :version => @diff.content_to.version
+                          %>/<%= @page.content.version %>
+<em>(<%= @diff.content_to.author ?
+             link_to_user(@diff.content_to.author.name) : l(:label_user_anonymous)
+      %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
+  <div style="float:right;">
+    <span class="diff_in"><%= l(:diff_popup_legend_add) %></span>&nbsp;<span class="diff_out"><%= l(:diff_popup_legend_remove) %></span>
+  </div>
+</div>
+<div class="text-diff">
+<%= simple_format_without_paragraph @diff.to_html %>
+</div>

assets/javascripts/wiki_popup.js

@@ -0,0 +1,50 @@
+function replaceWikiSubmitButton()
+{
+  $("button.wiki-popup, #project_id, #id").replaceAll($("#content > form > input.small")).filter("button.wiki-popup").show().on("click", function(){  
+    //on top dialog
+    var dlgName = "#diffpopup" + $("input[name='version_from']:checked").val() + "_" + $("input[name='version']:checked").val();
+    if ($(dlgName).size() == 1)
+    {
+      $(dlgName).dialog("moveToTop");
+      return false;
+    }
+    
+    //show dialog
+    var diffUrl = $(this).attr("url") + $(this).parent("form").serialize();
+    $.get(diffUrl, function (data) {
+      var params = q_to_hash(decodeURIComponent(this.url).split("?")[1].split("&"));
+      var popupId = "diffpopup" + params["version_from"] + "_" + params["version"];
+      $("#content").append("<div id='" + popupId + "'></div>");
+      $("#" + popupId).html(data).dialog({
+        title: $("#" + popupId).find("p.wiki-popup-title").text(),
+        width: window.innerWidth / 2 - 40,
+        maxHeight: window.innerHeight - 160,
+        position: { my: "center center", at: "right center", of: window },
+        create: function(event) {
+          $(event.target).dialog("widget").css({ "position": "fixed" });
+        },
+        open: function() {
+          $(this).find("a").blur();
+        },
+        resizeStart: function(event) {
+          $(event.target).dialog("option", "maxHeight", "");
+        },
+        close: function (event) {
+          $(this).dialog("destroy");
+          $(event.target).remove();
+        }
+      }).show();
+    });
+
+    return false;
+  });
+}
+
+function q_to_hash(param){
+  var hs = new Object;
+  for(var i=0;i < param.length;i++) {
+    var kv = param[i].split("=");
+    hs[kv[0]]=kv[1];
+  }
+  return hs;
+}

config/locales/en.yml

@@ -3,3 +3,4 @@ en:
   diff_popup_legend_add: "Added"
   diff_popup_legend_remove: "Removed"
   field_enable_popup_journal_diff: "Enable popup show of issue's history diff"
+  field_enable_popup_wiki_diff: "Enable popup show of wiki's history diff"

config/locales/ja.yml

@@ -3,3 +3,4 @@ ja:
   diff_popup_legend_add: "追加"
   diff_popup_legend_remove: "削除"
   field_enable_popup_journal_diff: "チケット履歴の差分をポップアップ表示する"
+  field_enable_popup_wiki_diff: "Wiki履歴の差分をポップアップ表示する"

config/routes.rb

@@ -1,3 +1,4 @@
 Rails.application.routes.draw do
   get 'diff_popup/journal_diff', to: 'diff_popup#journal_diff'
+  match 'wiki_popup/:action', :controller => 'wiki_popup', :via => [:get]
 end

init.rb

@@ -18,7 +18,8 @@
   name 'Redmine Diff Popup plugin'
   author 'Ryuta Tobita'
   description 'This plugin provide on pop-up show feature of diff.'
-  version '1.0.1'
+  version '2.0.0'
   url 'https://github.com/GEROMAX/redmine_diff_popup'
   author_url 'https://github.com/GEROMAX'
+  permission :wiki_popup, {:wiki_popup => [:wiki_diff]}, :public => true
 end

lib/redmine_diff_popup/hooks/diff_popup_hook.rb

@@ -2,4 +2,28 @@ class DiffPopupHook < Redmine::Hook::ViewListener
   render_on :view_issues_history_journal_bottom, :partial => 'issues/issues_history_journal_bottom_partial'
   render_on :view_issues_show_details_bottom, :partial => 'issues/issues_show_details_bottom_partial'
   render_on :view_my_account_preferences, :partial => 'my/diff_popup_preferences'
+
+  def view_layouts_base_html_head(context={})
+    if is_wiki_history?(context[:request])
+      context[:controller].send(:render_to_string, {
+        :partial => 'layouts/wiki_popup_html_head_partial',
+        :locals => context
+      })
+    end
+  end
+
+  def view_layouts_base_content(context={})
+    if is_wiki_history?(context[:request])
+      context[:controller].send(:render_to_string, {
+        :partial => 'layouts/wiki_popup_content_partial',
+        :locals => context
+      })
+    end
+  end
+
+private
+  def is_wiki_history?(request)
+    request.original_url =~ Regexp.new('/projects/\S+/wiki/\S+/history')
+  end
+  
 end

lib/redmine_diff_popup/patches/user_preference_patch.rb

@@ -8,13 +8,17 @@ def self.prepended(base)
         base.class_eval do
           if defined? safe_attributes
             safe_attributes :enable_popup_journal_diff
+            safe_attributes :enable_popup_wiki_diff
           end
         end
       end
 
       def enable_popup_journal_diff; self[:enable_popup_journal_diff] || '1'; end
       def enable_popup_journal_diff=(value); self[:enable_popup_journal_diff]=value; end
 
+      def enable_popup_wiki_diff; self[:enable_popup_wiki_diff] || '1'; end
+      def enable_popup_wiki_diff=(value); self[:enable_popup_wiki_diff]=value; end
+
     end
   end
 end