html escape

diff --git a/app/controllers/original_lisences_controller.rb b/app/controllers/original_lisences_controller.rb
index d43d0f4..b0b32b9 100644 (file)
--- a/app/controllers/original_lisences_controller.rb
+++ b/app/controllers/original_lisences_controller.rb
@@ -45,7 +45,7 @@ class OriginalLisencesController < ApplicationController
     @original_lisence = OriginalLisence.new(params[:original_lisence])
     @original_lisence.artist_id = current_author.artist.id
     respond_to do |format|
-      if @original_lisence.save
+      if @original_lisence.save_save
         format.html { redirect_to @original_lisence, notice: 'Original lisence was successfully created.' }
         format.json { render json: @original_lisence, status: :created, location: @original_lisence }
       else

diff --git a/app/models/original_lisence.rb b/app/models/original_lisence.rb
index c87cda5..ae1eb92 100644 (file)
--- a/app/models/original_lisence.rb
+++ b/app/models/original_lisence.rb
@@ -7,9 +7,6 @@ class OriginalLisence < ActiveRecord::Base
       :name => self.name, :url => self.url, :cc_by => self.cc_by, :cc_sa => self.cc_sa, :cc_nd => self.cc_nd, :cc_nc => self.cc_nc, 
       :no_resize => self.no_resize, :no_flip => self.no_flip, :keep_aspect_ratio => self.keep_aspect_ratio
     })
-    self.lisence_id = 0
-    res = self.save
-    return false unless res
     return false unless lisence.save
     self.lisence_id = lisence.id
     res = self.save

diff --git a/app/views/artists/index.html.erb b/app/views/artists/index.html.erb
index 39e31fa..97575f8 100644 (file)
--- a/app/views/artists/index.html.erb
+++ b/app/views/artists/index.html.erb
@@ -10,7 +10,7 @@
 <% @artists.each do |artist| %>
   <tr>
     <td><%= artist.author_id %></td>
-    <td><%= artist.name %></td>
+    <td><%= h artist.name %></td>
     <td><%= link_to 'Show', artist %></td>
   </tr>
 <% end %>

diff --git a/app/views/comics/play.html.erb b/app/views/comics/play.html.erb
index 2bde1ba..c038dc0 100644 (file)
--- a/app/views/comics/play.html.erb
+++ b/app/views/comics/play.html.erb
@@ -2,7 +2,7 @@
 
 <p>
   <b>Title:</b>
-  <%= @comic.title %>
+  <%= h @comic.title %>
 </p>
 
 <p>

diff --git a/app/views/common_lisences/index.html.erb b/app/views/common_lisences/index.html.erb
index c57bc22..4639c68 100644 (file)
--- a/app/views/common_lisences/index.html.erb
+++ b/app/views/common_lisences/index.html.erb
@@ -18,15 +18,15 @@
 
 <% @common_lisences.each do |common_lisence| %>
   <tr>
-    <td><%=@common_lisence.name %></td>
-    <td><%=@common_lisence.url %></td>
-    <td><%=@common_lisence.cc_by %></td>
-    <td><%=@common_lisence.cc_sa %></td>
-    <td><%=@common_lisence.cc_nd %></td>
-    <td><%=@common_lisence.cc_nc %></td>
-    <td><%=@common_lisence.no_resize %></td>
-    <td><%=@common_lisence.no_flip %></td>
-    <td><%=@common_lisence.keep_aspect_ratio %></td>
+    <td><%= h @common_lisence.name %></td>
+    <td><%= h @common_lisence.url %></td>
+    <td><%= @common_lisence.cc_by %></td>
+    <td><%= @common_lisence.cc_sa %></td>
+    <td><%= @common_lisence.cc_nd %></td>
+    <td><%= @common_lisence.cc_nc %></td>
+    <td><%= @common_lisence.no_resize %></td>
+    <td><%= @common_lisence.no_flip %></td>
+    <td><%= @common_lisence.keep_aspect_ratio %></td>
     <td><%= link_to 'Show', common_lisence %></td>
     <td><%= link_to 'Edit', edit_common_lisence_path(common_lisence) %></td>
     <td><%= link_to 'Destroy', common_lisence, confirm: 'Are you sure?', method: :delete %></td>

diff --git a/app/views/common_lisences/show.html.erb b/app/views/common_lisences/show.html.erb
index 067f510..d313be6 100644 (file)
--- a/app/views/common_lisences/show.html.erb
+++ b/app/views/common_lisences/show.html.erb
@@ -2,12 +2,12 @@
 
 <p>
   <b>name:</b>
-  <%= @common_lisence.name %>
+  <%= h @common_lisence.name %>
 </p>
 
 <p>
   <b>url:</b>
-  <%= @common_lisence.url %>
+  <%= h @common_lisence.url %>
 </p>
 
 <p>

diff --git a/app/views/lisences/index.html.erb b/app/views/lisences/index.html.erb
index d14ee88..56111b4 100644 (file)
--- a/app/views/lisences/index.html.erb
+++ b/app/views/lisences/index.html.erb
@@ -16,8 +16,8 @@
 
 <% @lisences.each do |lisence| %>
   <tr>
-    <td><%= lisence.name %></td>
-    <td><%= lisence.url %></td>
+    <td><%= h lisence.name %></td>
+    <td><%= h lisence.url %></td>
     <td><%= lisence.cc_by %></td>
     <td><%= lisence.cc_sa %></td>
     <td><%= lisence.cc_nd %></td>

diff --git a/app/views/original_lisences/show.html.erb b/app/views/original_lisences/show.html.erb
index 8ec72b7..49ef7ce 100644 (file)
--- a/app/views/original_lisences/show.html.erb
+++ b/app/views/original_lisences/show.html.erb
@@ -2,12 +2,12 @@
 
 <p>
   <b>name:</b>
-  <%= @original_lisence.name %>
+  <%= h @original_lisence.name %>
 </p>
 
 <p>
   <b>url:</b>
-  <%= @original_lisence.url %>
+  <%= h @original_lisence.url %>
 </p>
 
 <p>

diff --git a/app/views/speaches/index.html.erb b/app/views/speaches/index.html.erb
index 434bef7..8eb855b 100644 (file)
--- a/app/views/speaches/index.html.erb
+++ b/app/views/speaches/index.html.erb
@@ -13,7 +13,7 @@
 <% @speaches.each do |speach| %>
   <tr>
     <td><%= speach.balloon_id %></td>
-    <td><%= speach.content %></td>
+    <td><%= h speach.content %></td>
     <td><%= speach.top_offset %></td>
     <td><%= speach.left_offset %></td>
     <td><%= speach.width %></td>