[Git][noosfero/noosfero][master] 3 commits: Merge branch 'master-update' into 'master'
Rodrigo Souto
gitlab at mg.gitlab.com
Wed May 16 15:38:37 BRT 2018
Rodrigo Souto pushed to branch master at Noosfero / noosfero
Commits:
05c54e03 by Lucas Martins at 2018-05-08T20:17:19Z
Merge branch 'master-update' into 'master'
Updates master
See merge request noosfero-gces/noosfero!2
- - - - -
5291be75 by Stefania Bezerra da Silva at 2018-05-15T19:26:37Z
"Removing max_length"
Signed-off-by: thiagorfm <t_moreira at outlook.com>
Signed-off-by: Stefania Bezerra da Silva <stefaniabezerra95 at gmail.com>
- - - - -
279a1de6 by Rodrigo Souto at 2018-05-16T18:38:25Z
Merge branch 'issue_21_maxLength_remove' into 'master'
Issue_21_maxLength_remove
See merge request noosfero/noosfero!1491
- - - - -
12 changed files:
- app/views/box_organizer/_link_list_item.html.erb
- app/views/box_organizer/edit.html.erb
- app/views/cms/_blog.html.erb
- app/views/cms/_event.html.erb
- app/views/cms/_folder.html.erb
- app/views/cms/_forum.html.erb
- app/views/cms/_gallery.html.erb
- app/views/cms/_published_article.html.erb
- app/views/cms/_text_article.html.erb
- app/views/cms/_uploaded_file.html.erb
- app/views/profile_editor/_person_form.html.erb
- app/views/shared/_organization_custom_fields.html.erb
Changes:
=====================================
app/views/box_organizer/_link_list_item.html.erb
=====================================
--- a/app/views/box_organizer/_link_list_item.html.erb
+++ b/app/views/box_organizer/_link_list_item.html.erb
@@ -3,7 +3,7 @@
<%= icon_selector(link[:icon]) %>
</td>
<td>
- <%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %>
+ <%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name' %>
</td>
<td>
<%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %>
=====================================
app/views/box_organizer/edit.html.erb
=====================================
--- a/app/views/box_organizer/edit.html.erb
+++ b/app/views/box_organizer/edit.html.erb
@@ -3,7 +3,7 @@
<%= form_tag(:action => 'save', :id => @block.id) do %>
- <%= labelled_form_field(_('Custom title for this block: '), text_field(:block, :title, :maxlength => 20)) %>
+ <%= labelled_form_field(_('Custom title for this block: '), text_field(:block, :title)) %>
<%= labelled_form_field(_('Custom subtitle for this block: '), text_field(:block, :subtitle)) %>
<%= render_partial_for_class @block.class %>
=====================================
app/views/cms/_blog.html.erb
=====================================
--- a/app/views/cms/_blog.html.erb
+++ b/app/views/cms/_blog.html.erb
@@ -2,7 +2,7 @@
<h1><%= _('My Blog') %></h1>
-<%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>
+<%= required f.text_field(:name, :size => '64', :onchange => "updateUrlField(this, 'article_slug')") %>
<%= render :partial => 'general_fields' %>
=====================================
app/views/cms/_event.html.erb
=====================================
--- a/app/views/cms/_event.html.erb
+++ b/app/views/cms/_event.html.erb
@@ -1,6 +1,6 @@
<%= required_fields_message %>
-<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
+<%= required f.text_field('name', :size => '64') %>
<%= render :partial => 'general_fields' %>
<%= render :partial => 'translatable' %>
=====================================
app/views/cms/_folder.html.erb
=====================================
--- a/app/views/cms/_folder.html.erb
+++ b/app/views/cms/_folder.html.erb
@@ -1,6 +1,6 @@
<%= required_fields_message %>
-<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
+<%= required f.text_field('name', :size => '64') %>
<%= render :partial => 'general_fields' %>
<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
=====================================
app/views/cms/_forum.html.erb
=====================================
--- a/app/views/cms/_forum.html.erb
+++ b/app/views/cms/_forum.html.erb
@@ -4,7 +4,7 @@
<%= required_fields_message %>
-<%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>
+<%= required f.text_field(:name, :size => '64', :onchange => "updateUrlField(this, 'article_slug')") %>
<%= render :partial => 'general_fields' %>
=====================================
app/views/cms/_gallery.html.erb
=====================================
--- a/app/views/cms/_gallery.html.erb
+++ b/app/views/cms/_gallery.html.erb
@@ -1,6 +1,6 @@
<%= required_fields_message %>
-<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
+<%= required f.text_field('name', :size => '64') %>
<%= render :partial => 'general_fields' %>
=====================================
app/views/cms/_published_article.html.erb
=====================================
--- a/app/views/cms/_published_article.html.erb
+++ b/app/views/cms/_published_article.html.erb
@@ -1,4 +1,4 @@
-<%= f.text_field 'name', :size => '64', :maxlength => 150 %>
+<%= f.text_field 'name', :size => '64'%>
<%= render :partial => 'general_fields' %>
<p><%= _('This is a republication of "%s", by %s.') % [link_to(h(@article.reference_article.title), @article.reference_article.url), @article.reference_article.profile.name] %></p>
=====================================
app/views/cms/_text_article.html.erb
=====================================
--- a/app/views/cms/_text_article.html.erb
+++ b/app/views/cms/_text_article.html.erb
@@ -1,6 +1,6 @@
<%= required_fields_message %>
-<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '72', :maxlength => 150)) %>
+<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '72')) %>
<%= render :partial => 'text_fields' %>
<%= render :partial => 'general_fields' %>
=====================================
app/views/cms/_uploaded_file.html.erb
=====================================
--- a/app/views/cms/_uploaded_file.html.erb
+++ b/app/views/cms/_uploaded_file.html.erb
@@ -1,4 +1,4 @@
-<%= labelled_form_field(_('Title'), text_field(:article, :title, :maxlength => 60)) %>
+<%= labelled_form_field(_('Title'), text_field(:article, :title)) %>
<%= render :partial => 'upload_file', :locals => {:size => '45', :name => 'article', :single_file => true} %>
=====================================
app/views/profile_editor/_person_form.html.erb
=====================================
--- a/app/views/profile_editor/_person_form.html.erb
+++ b/app/views/profile_editor/_person_form.html.erb
@@ -4,7 +4,7 @@
<% editing_profile ||= false %>
<%= optional_field(@person, 'nickname') do %>
- <%= f.text_field(:nickname, :maxlength => 16, :size => 30, :rel => _('Nickname')) %>
+ <%= f.text_field(:nickname, :size => 30, :rel => _('Nickname')) %>
<div>
<small><%= _('A short name by which you like to be known. Will be used in friends listings, community member listings etc.') %></small>
</div>
=====================================
app/views/shared/_organization_custom_fields.html.erb
=====================================
--- a/app/views/shared/_organization_custom_fields.html.erb
+++ b/app/views/shared/_organization_custom_fields.html.erb
@@ -4,7 +4,7 @@
<% if profile.enterprise? %>
<%= optional_field(profile, 'business_name', f.text_field(:business_name)) %>
<% end %>
-<%= optional_field(profile, 'description', f.text_area(:description, :rows => 5)) %> <!-- , :maxlength => 10 -->
+<%= optional_field(profile, 'description', f.text_area(:description, :rows => 5)) %>
<%= optional_field(profile, 'contact_person', f.text_field(:contact_person)) %>
<%= optional_field(profile, 'contact_email', f.text_field(:contact_email)) %>
<%= optional_field(profile, 'contact_phone', f.text_field(:contact_phone)) %>
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/4fff98586c3936442849b55418e132c965fa8589...279a1de6fbe0da85897d8cee817af8530cdecf1f
--
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/4fff98586c3936442849b55418e132c965fa8589...279a1de6fbe0da85897d8cee817af8530cdecf1f
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180516/4365a98c/attachment-0001.html>
More information about the Noosfero-dev
mailing list