Fixes #220
Description as well as short description will be optional for proposal dashboard actions. Additionally some minor bugfixes have been fixed.
This commit is contained in:
@@ -1185,3 +1185,7 @@ table {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.js-document-attachment {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|||||||
@@ -19,10 +19,6 @@ class ProposalDashboardAction < ActiveRecord::Base
|
|||||||
allow_blank: false,
|
allow_blank: false,
|
||||||
length: { in: 4..80 }
|
length: { in: 4..80 }
|
||||||
|
|
||||||
validates :description,
|
|
||||||
presence: true,
|
|
||||||
allow_blank: false
|
|
||||||
|
|
||||||
validates :action_type, presence: true
|
validates :action_type, presence: true
|
||||||
|
|
||||||
validates :day_offset,
|
validates :day_offset,
|
||||||
|
|||||||
@@ -64,9 +64,11 @@
|
|||||||
<hr>
|
<hr>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="documents small-12 column">
|
<% if feature?(:allow_attached_documents) %>
|
||||||
<%= render 'documents/nested_documents', documentable: proposal_dashboard_action, f: f %>
|
<div class="documents small-12 column">
|
||||||
</div>
|
<%= render 'documents/nested_documents', documentable: proposal_dashboard_action, f: f %>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
<div class="small-12 column">
|
<div class="small-12 column">
|
||||||
<hr>
|
<hr>
|
||||||
|
|||||||
@@ -1103,8 +1103,8 @@ es:
|
|||||||
edit: Editar
|
edit: Editar
|
||||||
delete: Borrar
|
delete: Borrar
|
||||||
no_records: No se encontraron registros
|
no_records: No se encontraron registros
|
||||||
active: Si
|
active: 'Si'
|
||||||
inactive: No
|
inactive: 'No'
|
||||||
new:
|
new:
|
||||||
creating: Nueva acción para el dashboard de propuestas
|
creating: Nueva acción para el dashboard de propuestas
|
||||||
back: Volver a la lista
|
back: Volver a la lista
|
||||||
|
|||||||
@@ -40,14 +40,6 @@ describe ProposalDashboardAction do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when validating description' do
|
|
||||||
context 'and description is blank' do
|
|
||||||
let(:description) { nil }
|
|
||||||
|
|
||||||
it { should_not be_valid }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when validating day_offset' do
|
context 'when validating day_offset' do
|
||||||
context 'and day_offset is nil' do
|
context 'and day_offset is nil' do
|
||||||
let(:day_offset) { nil }
|
let(:day_offset) { nil }
|
||||||
|
|||||||
Reference in New Issue
Block a user