Small changes on licenses

* Licenses only can be removed with method 'post' * Fixing truncate calls to stop displaying deprecation warnings * Added buttons to add a new license and to go back to admin panel * Added new db/schema (ActionItem2379)

Small changes on licenses
* Licenses only can be removed with method 'post' * Fixing truncate calls to stop displaying deprecation warnings * Added buttons to add a new license and to go back to admin panel * Added new db/schema (ActionItem2379)
Daniela Feitosa
1 parent 3e98d8f0
Showing 6 changed files with 58 additions and 16 deletions Show diff stats
app/controllers/admin/licenses_controller.rb
app/views/cms/_general_fields.html.erb
app/views/licenses/index.html.erb
db/schema.rb
public/stylesheets/application.css
test/functional/licenses_controller_test.rb
@@ -20,7 +20,7 @@ class LicensesController &lt; AdminController
   end
  
   def edit
-    @license = License.find(params[:license_id])
+    @license = environment.licenses.find(params[:license_id])
     if request.post?
       begin
         @license.update_attributes!(params[:license])
@@ -33,12 +33,16 @@ class LicensesController &lt; AdminController
   end
  
   def remove
-    @license = License.find(params[:license_id])
-    begin
-      @license.destroy
-      session[:notice] = _('Licese removed')
-    rescue
-      session[:notice] = _('Licese could not be removed')
+    @license = environment.licenses.find(params[:license_id])
+    if request.post?
+      begin
+        @license.destroy
+        session[:notice] = _('License removed')
+      rescue
+        session[:notice] = _('License could not be removed')
+      end
+    else
+      session[:notice] = _('License could not be removed')
     end
     redirect_to :action => 'index'
   end
-<%= labelled_form_field(_('License'), select(:article, :license_id, [[_('None'), nil]] + profile.environment.licenses.map {|license| [license.name, license.id]})) %>
+<%= labelled_form_field(_('License'), select(:article, :license_id, options_for_select_with_title([[_('None'), nil]] + profile.environment.licenses.map {|license| [license.name, license.id]}, @article.license ? @article.license.id : nil))) %>
 <h1><%= _('Manage licenses') %></h1>
-<table style='width: 100%; overflow: hidden;'>
+<table style='overflow: hidden;'>
   <tr>
     <th style='width: 25%'><%= _('Name') %></th>
     <th style='width: 60%'><%= _('Url reference') %></th>
@@ -7,14 +7,16 @@
   </tr>
   <% @licenses.each do |license| %>
     <tr>
-      <td title="<%= license.name%>"><%= truncate(license.name, 19) %></td>
-      <td title="<%= license.url %>"><%= license.url.present? ? link_to(truncate(license.url, 60), license.url, :target => '_blank') : '' %></td>
+      <td title="<%= license.name%>"><%= truncate(license.name, :length => 19) %></td>
+      <td title="<%= license.url %>"><%= license.url.present? ? link_to(truncate(license.url, :length => 60), license.url, :target => '_blank') : '' %></td>
       <td style='white-space: nowrap;'>
         <%= button_without_text :edit, _('Edit'), :action => 'edit', :license_id => license.id %>
-        <%= button_without_text :remove, _('Remove'), {:action => 'remove', :license_id => license.id}, :confirm => _('Are you sure you want to remove this license?') %></td>
+        <%= button_without_text :remove, _('Remove'), {:action => 'remove', :license_id => license.id}, :method => 'post', :confirm => _('Are you sure you want to remove this license?') %></td>
     </tr>
   <% end %>
-  <tr>
-    <td colspan='3' style='text-align: center'><strong><%= link_to(_('NEW LICENSE'), :action => 'create')%></strong></td>
-  </tr>
 </table>
+
+<% button_bar do %>
+  <%= button(:add, _('Add a new license'), :action => 'create')%>
+  <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+<% end %>
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20120718145131) do
+ActiveRecord::Schema.define(:version => 20120718162001) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -85,6 +85,7 @@ ActiveRecord::Schema.define(:version =&gt; 20120718145131) do
     t.integer  "translation_of_id"
     t.string   "language"
     t.string   "source_name"
+    t.integer  "license_id"
   end
  
   create_table "articles", :force => true do |t|
@@ -125,6 +126,7 @@ ActiveRecord::Schema.define(:version =&gt; 20120718145131) do
     t.integer  "translation_of_id"
     t.string   "language"
     t.string   "source_name"
+    t.integer  "license_id"
   end
  
   add_index "articles", ["translation_of_id"], :name => "index_articles_on_translation_of_id"
@@ -314,6 +316,13 @@ ActiveRecord::Schema.define(:version =&gt; 20120718145131) do
   add_index "inputs", ["product_category_id"], :name => "index_inputs_on_product_category_id"
   add_index "inputs", ["product_id"], :name => "index_inputs_on_product_id"
  
+  create_table "licenses", :force => true do |t|
+    t.string  "name",           :null => false
+    t.string  "slug",           :null => false
+    t.string  "url"
+    t.integer "environment_id", :null => false
+  end
+
   create_table "mailing_sents", :force => true do |t|
     t.integer  "mailing_id"
     t.integer  "person_id"
@@ -2960,6 +2960,11 @@ table.cms-articles .icon:hover {
 .controller-cms ul.categories li.cat_checked {
   background: #B8CFE7;
 }
+
+.controller-cms select#article_license_id {
+  max-width: 100%;
+}
+
 /************* external blog options *****************/
  
 .controller-cms #fetch-external-feed {
@@ -26,6 +26,18 @@ class LicensesControllerTest &lt; ActionController::TestCase
     assert_includes assigns(:licenses), l2
   end
  
+  should 'not list licenses from other environments' do
+    other_env = fast_create(Environment)
+    l1 = License.create!(:name => 'GPLv3', :environment => environment)
+    l2 = License.create!(:name => 'AGPL', :environment => other_env)
+    @controller.stubs(:environment).returns(environment)
+
+    get :index
+
+    assert_includes assigns(:licenses), l1
+    assert_not_includes assigns(:licenses), l2
+  end
+
   should 'create a new license' do
     assert_difference License, :count, 1 do
       post :create, :license => {:name => 'GPLv3'}
@@ -43,4 +55,14 @@ class LicensesControllerTest &lt; ActionController::TestCase
     post :remove, :license_id => license.id
     assert_raise(ActiveRecord::RecordNotFound) {License.find(license.id)}
   end
+
+  should 'remove a license only with post method' do
+    license = License.create!(:name => 'GPLv3', :environment => environment)
+    get :remove, :license_id => license.id
+    assert_nothing_raised ActiveRecord::RecordNotFound do
+      License.find(license.id)
+    end
+    assert_redirected_to :action => 'index'
+  end
+
 end
...	...	@@ -20,7 +20,7 @@ class LicensesController < AdminController
20	20	end
21	21
22	22	def edit
23		- @license = License.find(params[:license_id])
	23	+ @license = environment.licenses.find(params[:license_id])
24	24	if request.post?
25	25	begin
26	26	@license.update_attributes!(params[:license])
...	...	@@ -33,12 +33,16 @@ class LicensesController < AdminController
33	33	end
34	34
35	35	def remove
36		- @license = License.find(params[:license_id])
37		- begin
38		- @license.destroy
39		- session[:notice] = _('Licese removed')
40		- rescue
41		- session[:notice] = _('Licese could not be removed')
	36	+ @license = environment.licenses.find(params[:license_id])
	37	+ if request.post?
	38	+ begin
	39	+ @license.destroy
	40	+ session[:notice] = _('License removed')
	41	+ rescue
	42	+ session[:notice] = _('License could not be removed')
	43	+ end
	44	+ else
	45	+ session[:notice] = _('License could not be removed')
42	46	end
43	47	redirect_to :action => 'index'
44	48	end
...	...
1		-<%= labelled_form_field(_('License'), select(:article, :license_id, [[_('None'), nil]] + profile.environment.licenses.map {\|license\| [license.name, license.id]})) %>
	1	+<%= labelled_form_field(_('License'), select(:article, :license_id, options_for_select_with_title([[_('None'), nil]] + profile.environment.licenses.map {\|license\| [license.name, license.id]}, @article.license ? @article.license.id : nil))) %>
...	...
1	1	<h1><%= _('Manage licenses') %></h1>
2		-<table style='width: 100%; overflow: hidden;'>
	2	+<table style='overflow: hidden;'>
3	3	<tr>
4	4	<th style='width: 25%'><%= _('Name') %></th>
5	5	<th style='width: 60%'><%= _('Url reference') %></th>
...	...	@@ -7,14 +7,16 @@
7	7	</tr>
8	8	<% @licenses.each do \|license\| %>
9	9	<tr>
10		- <td title="<%= license.name%>"><%= truncate(license.name, 19) %></td>
11		- <td title="<%= license.url %>"><%= license.url.present? ? link_to(truncate(license.url, 60), license.url, :target => '_blank') : '' %></td>
	10	+ <td title="<%= license.name%>"><%= truncate(license.name, :length => 19) %></td>
	11	+ <td title="<%= license.url %>"><%= license.url.present? ? link_to(truncate(license.url, :length => 60), license.url, :target => '_blank') : '' %></td>
12	12	<td style='white-space: nowrap;'>
13	13	<%= button_without_text :edit, _('Edit'), :action => 'edit', :license_id => license.id %>
14		- <%= button_without_text :remove, _('Remove'), {:action => 'remove', :license_id => license.id}, :confirm => _('Are you sure you want to remove this license?') %></td>
	14	+ <%= button_without_text :remove, _('Remove'), {:action => 'remove', :license_id => license.id}, :method => 'post', :confirm => _('Are you sure you want to remove this license?') %></td>
15	15	</tr>
16	16	<% end %>
17		- <tr>
18		- <td colspan='3' style='text-align: center'><strong><%= link_to(_('NEW LICENSE'), :action => 'create')%></strong></td>
19		- </tr>
20	17	</table>
	18	+
	19	+<% button_bar do %>
	20	+ <%= button(:add, _('Add a new license'), :action => 'create')%>
	21	+ <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
	22	+<% end %>
...	...
...	...	@@ -9,7 +9,7 @@
9	9	#
10	10	# It's strongly recommended to check this file into your version control system.
11	11
12		-ActiveRecord::Schema.define(:version => 20120718145131) do
	12	+ActiveRecord::Schema.define(:version => 20120718162001) do
13	13
14	14	create_table "abuse_reports", :force => true do \|t\|
15	15	t.integer "reporter_id"
...	...	@@ -85,6 +85,7 @@ ActiveRecord::Schema.define(:version => 20120718145131) do
85	85	t.integer "translation_of_id"
86	86	t.string "language"
87	87	t.string "source_name"
	88	+ t.integer "license_id"
88	89	end
89	90
90	91	create_table "articles", :force => true do \|t\|
...	...	@@ -125,6 +126,7 @@ ActiveRecord::Schema.define(:version => 20120718145131) do
125	126	t.integer "translation_of_id"
126	127	t.string "language"
127	128	t.string "source_name"
	129	+ t.integer "license_id"
128	130	end
129	131
130	132	add_index "articles", ["translation_of_id"], :name => "index_articles_on_translation_of_id"
...	...	@@ -314,6 +316,13 @@ ActiveRecord::Schema.define(:version => 20120718145131) do
314	316	add_index "inputs", ["product_category_id"], :name => "index_inputs_on_product_category_id"
315	317	add_index "inputs", ["product_id"], :name => "index_inputs_on_product_id"
316	318
	319	+ create_table "licenses", :force => true do \|t\|
	320	+ t.string "name", :null => false
	321	+ t.string "slug", :null => false
	322	+ t.string "url"
	323	+ t.integer "environment_id", :null => false
	324	+ end
	325	+
317	326	create_table "mailing_sents", :force => true do \|t\|
318	327	t.integer "mailing_id"
319	328	t.integer "person_id"
...	...
...	...	@@ -2960,6 +2960,11 @@ table.cms-articles .icon:hover {
2960	2960	.controller-cms ul.categories li.cat_checked {
2961	2961	background: #B8CFE7;
2962	2962	}
	2963	+
	2964	+.controller-cms select#article_license_id {
	2965	+ max-width: 100%;
	2966	+}
	2967	+
2963	2968	/*********** external blog options ***************/
2964	2969
2965	2970	.controller-cms #fetch-external-feed {
...	...
...	...	@@ -26,6 +26,18 @@ class LicensesControllerTest < ActionController::TestCase
26	26	assert_includes assigns(:licenses), l2
27	27	end
28	28
	29	+ should 'not list licenses from other environments' do
	30	+ other_env = fast_create(Environment)
	31	+ l1 = License.create!(:name => 'GPLv3', :environment => environment)
	32	+ l2 = License.create!(:name => 'AGPL', :environment => other_env)
	33	+ @controller.stubs(:environment).returns(environment)
	34	+
	35	+ get :index
	36	+
	37	+ assert_includes assigns(:licenses), l1
	38	+ assert_not_includes assigns(:licenses), l2
	39	+ end
	40	+
29	41	should 'create a new license' do
30	42	assert_difference License, :count, 1 do
31	43	post :create, :license => {:name => 'GPLv3'}
...	...	@@ -43,4 +55,14 @@ class LicensesControllerTest < ActionController::TestCase
43	55	post :remove, :license_id => license.id
44	56	assert_raise(ActiveRecord::RecordNotFound) {License.find(license.id)}
45	57	end
	58	+
	59	+ should 'remove a license only with post method' do
	60	+ license = License.create!(:name => 'GPLv3', :environment => environment)
	61	+ get :remove, :license_id => license.id
	62	+ assert_nothing_raised ActiveRecord::RecordNotFound do
	63	+ License.find(license.id)
	64	+ end
	65	+ assert_redirected_to :action => 'index'
	66	+ end
	67	+
46	68	end
...	...