diff --git a/lib/repository_block.rb b/lib/repository_block.rb index 59d1254..483da7a 100644 --- a/lib/repository_block.rb +++ b/lib/repository_block.rb @@ -1,8 +1,7 @@ class RepositoryBlock < Block - attr_accessible :link, :show_name + attr_accessible :show_name - settings_items :link, :type => :string, :default => '' settings_items :show_name, :type => :boolean, :default => false def self.description diff --git a/test/unit/repository_block_test.rb b/test/unit/repository_block_test.rb index ccc6889..2580e79 100644 --- a/test/unit/repository_block_test.rb +++ b/test/unit/repository_block_test.rb @@ -16,13 +16,4 @@ class RepositoryBlockTest < ActiveSupport::TestCase should 'describe itself' do assert_not_equal Block.description, RepositoryBlock.description end - - should 'have software info to repository it' do - - link = "gitlab.com/teste" - - block = RepositoryBlock.create(:link => link) - - assert_equal block.link, link, "Link should not be empty" - end end diff --git a/views/blocks/download.html.erb b/views/blocks/download.html.erb index 2fd9a51..333ec9b 100644 --- a/views/blocks/download.html.erb +++ b/views/blocks/download.html.erb @@ -1,28 +1,32 @@ -
-
-

<%= _("Download") %>

+<% if block.owner.software_info.nil? %> + <%= _("This community needs a software to use this block") %> +<% else %> +
+
+

<%= _("Download") %>

- - <%= link_to block.name, "#" %> - + + <%= link_to block.name, "#" %> + - - <%= _(block.software_description) %> - -
+ + <%= _(block.software_description) %> + +
-

- - <%= link_to _("Minimal Requirements") , block.owner.admin_url, :class => "anchor-link", :target => "_self" %> - +

+ + <%= link_to _("Minimal Requirements") , block.owner.public_profile_url, :class => "anchor-link", :target => "_self" %> + - - <%= link_to(_("Version News"), block.version_news, :class => "anchor-link", :target => "_self") if !block.version_news.blank? %> - + + <%= link_to(_("Version News"), block.version_news, :class => "anchor-link", :target => "_self") if !block.version_news.blank? %> + - - <%= _("Licensed by") %> - <%= link_to block.owner.software_info.license_info.version , block.owner.software_info.license_info.link, :target => "_blank" %> - -

-
+ + <%= _("Licensed by") %> + <%= link_to block.owner.software_info.license_info.version , block.owner.software_info.license_info.link, :target => "_blank" %> + +

+
+<% end %> \ No newline at end of file diff --git a/views/blocks/repository.html.erb b/views/blocks/repository.html.erb index 151c943..3d7cd58 100644 --- a/views/blocks/repository.html.erb +++ b/views/blocks/repository.html.erb @@ -1 +1,5 @@ -<%= link_to _("Repository") , block.link, :id => "bt_repositorio", :target => "_blank" %> \ No newline at end of file +<% if block.owner.software_info.nil? %> + <%= _("This community needs a software to use this block") %> +<% else %> + <%= link_to _("Repository") , block.owner.software_info.repository_link, :id => "bt_repositorio", :target => "_blank" %> +<% end %> \ No newline at end of file diff --git a/views/blocks/software_information.html.erb b/views/blocks/software_information.html.erb index 6647071..0422968 100644 --- a/views/blocks/software_information.html.erb +++ b/views/blocks/software_information.html.erb @@ -2,7 +2,6 @@ <% if block.owner.software_info.nil? %> <%= _("This community needs a software to use this block") %> - <% else %> diff --git a/views/box_organizer/_repository_block.html.erb b/views/box_organizer/_repository_block.html.erb deleted file mode 100644 index 8562145..0000000 --- a/views/box_organizer/_repository_block.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -
- <%= labelled_form_field _('Link:'), text_field_tag('block[link]', @block.link) %> -
-- libgit2 0.21.2