]> source.dussan.org Git - sonarqube.git/commitdiff
drop unused ruby code
authorStas Vilchik <vilchiks@gmail.com>
Thu, 2 Apr 2015 13:26:16 +0000 (15:26 +0200)
committerStas Vilchik <vilchiks@gmail.com>
Thu, 2 Apr 2015 13:26:16 +0000 (15:26 +0200)
server/sonar-web/src/main/webapp/WEB-INF/app/controllers/rules_controller.rb
server/sonar-web/src/main/webapp/WEB-INF/app/views/resource/_extension.html.erb [deleted file]
server/sonar-web/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb [deleted file]
server/sonar-web/src/main/webapp/WEB-INF/app/views/resource/_view.html.erb [deleted file]
server/sonar-web/src/main/webapp/WEB-INF/app/views/rules/_show_modal.html.erb [deleted file]
server/sonar-web/src/main/webapp/WEB-INF/app/views/rules/show.html.erb [deleted file]

index 16c1c9d86501ea055f9e27b1488ccd61a4e34fa9..2e9665fe9880b50805cd505280595eedbc071aaf 100644 (file)
@@ -17,6 +17,9 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
+require "erb"
+include ERB::Util
+
 class RulesController < ApplicationController
 
   SECTION=Navigation::SECTION_CONFIGURATION
@@ -24,25 +27,14 @@ class RulesController < ApplicationController
   # GET /rules/show/<key>
   # This URL is used by the Eclipse plugin
   #
-  # ==== Optional parameters
-  # 'layout' is false to remove sidebar and headers
-  #
   # Example: GET /rules/show/squid:AvoidCycles
   #
   def show
     require_parameters :id
 
-    @key=params[:id]
-    if @key.to_i==0
-      parts=@key.split(':')
-      @rule=Rule.first(:conditions => ['plugin_name=? and plugin_rule_key=?', parts[0], parts[1]])
-    else
-      @rule=Rule.find(@key)
-    end
-    @page_title=@rule.name if @rule
-
-    if params[:modal] == 'true'
-      render :partial => 'show_modal'
-    end
+    # the redirect is needed for the backward compatibility with eclipse plugin
+    url = url_for :controller => 'coding_rules', :action => 'index'
+    url = url + '#rule_key=' + url_encode(params[:id])
+    redirect_to url
   end
 end
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/resource/_extension.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/resource/_extension.html.erb
deleted file mode 100644 (file)
index a19fdb4..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  <%= render :inline => @extension.getTarget().getTemplate() -%>
-</div>
-
-<a class="js-extension-close extension-close link-action"><%= message('close') -%></a>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb
deleted file mode 100644 (file)
index 464ed39..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-   if @extensions.empty?
-%>
-  <span class="note"><%= message('code_viewer.no_info_displayed_due_to_security') -%></span>
-<%
-   else
-     display_title=(params[:display_title]=='true')
-%>
-
-  <% if display_title %>
-    <div class="source_title">
-      <% if @resource.project %>
-        <div class="note">
-          <%= h @resource.ancestor_projects.reverse.map{|p| p.name(true)}.join(' / ') -%>
-        </div>
-      <% end %>
-      <% if logged_in? %><%= link_to_favourite(@resource) -%><% end %>
-      <span class="h1"><%= qualifier_icon(@resource) -%> <%= h @resource.name(true) -%></span>
-    </div>
-  <% end %>
-
-  <div class="source_tabs">
-    <ul class="tabs">
-      <% @extensions.each do |extension| %>
-        <li>
-          <a href="#" onclick="return loadResourceViewer('<%= @resource.id -%>','<%= extension.getId() -%>',<%= display_title -%>,'<%= params[:period] -%>', this)"
-             class="<%= 'selected' if @extension && @extension.getId()==extension.getId() -%>"><%= message(extension.getId() + '.page', :default => extension.getTitle()) %></a>
-        </li>
-      <% end %>
-      <li>
-        <img src="<%= ApplicationController.root_context -%>/images/loading.gif" id="resource_loading" class="accordion-loading" style="display:none"/>
-      </li>
-    </ul>
-  </div>
-
-
-<%  end %>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/resource/_view.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/resource/_view.html.erb
deleted file mode 100644 (file)
index 33f134f..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<div>
-  <div class="accordion-item-header">
-    <%= render :partial => 'tabs' -%>
-  </div>
-  <div class="accordion-item-body">
-    <% if @extension.getTarget() # ruby on rails page %>
-      <%= render :inline => @extension.getTarget().getTemplate() -%>
-    <% end %>
-  </div>
-</div>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/rules/_show_modal.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/rules/_show_modal.html.erb
deleted file mode 100644 (file)
index b6e33d7..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<% if @rule %>
-<div class="modal-head">
-  <h2 class="rule-title">
-    <%= h @rule.name %>
-  </h2>
-  <% unless @rule.ready? %>
-    <div class="rule-status">
-      <% if @rule.beta? %>
-        <span><%= message('rules.status.beta') %></span>
-      <% elsif @rule.deprecated? %>
-        <span><%= message('rules.status.deprecated') %></span>
-      <% end %>
-    </div>
-  <% end %>
-  <ul class="modal-head-metadata">
-    <li><%= h @rule.plugin_name -%> : <%= h @rule.plugin_rule_key -%></li>
-  </ul>
-</div>
-
-<div class="modal-body rule-desc">
-  <% if @rule.description.strip.start_with?('<p>') %>
-    <%= Internal.text.interpretMacros(@rule.description) %>
-  <% else %>
-    <p><%= Internal.text.interpretMacros(@rule.description) %></p>
-  <% end %>
-
-  <% if @rule.note_data && !@rule.note_data.strip.blank? %>
-    <p> <%= Api::Utils.markdown_to_html(@rule.note_data) -%></p>
-  <% end %>
-</div>
-
-<% else %>
-<div class="modal-body">
-  <p class="error"><%= message('rules.not_found', :params => @key) %>
-</div>
-<% end %>
-
-<div class="modal-foot">
-  <a href="#" onclick="return closeModalWindow()" autofocus><%= h message('close') -%></a>
-</div>
-
-<script type="text/javascript">
-  $j(document).ready(function () {
-    // As links in rule description will be loaded after open-modal has been processed by jquery, we have to process manually rule-modal classes
-    $j('.rule-desc .rule-modal').modal();
-  });
-</script>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/rules/show.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/rules/show.html.erb
deleted file mode 100644 (file)
index a164c44..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<div>
-  <h1 class="rule-title"><%= h @rule.name %></h1>
-  <% unless @rule.ready? %>
-    <div class="rule-status">
-      <% if @rule.beta? %>
-        <span><%= message('rules.status.beta') %></span>
-      <% elsif @rule.deprecated? %>
-        <span><%= message('rules.status.deprecated') %></span>
-      <% end %>
-    </div>
-  <% end %>
-</div>
-
-<div class="note">
-<%= h @rule.plugin_name -%> : <%= h @rule.plugin_rule_key -%>
-</div>
-
-<div class="rule-desc">
-  <% if @rule.description.strip.start_with?('<p>') %>
-    <%= Internal.text.interpretMacros(@rule.description) %>
-  <% else %>
-    <p><%= Internal.text.interpretMacros(@rule.description) %></p>
-  <% end %>
-
-  <% if @rule.note_data && !@rule.note_data.strip.blank? %>
-    <p> <%= Api::Utils.markdown_to_html(@rule.note_data) -%></p>
-  <% end %>
-
-</div>