diff --git a/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb b/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb index e54aaa4..9843060 100644 --- a/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb +++ b/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb @@ -6,15 +6,11 @@ class MezuroPluginRepositoryController < MezuroPluginProfileController @project_content = profile.articles.find(params[:id]) @repository_types = Kalibro::Repository.repository_types - #@repository_type_select = [] - #repository_types.each do |repository_type| - # @repository_type_select.push [repository_type,repository_type] - #end configurations = Kalibro::Configuration.all - @configuration_select = [] - configurations.each do |configuration| - @configuration_select.push [configuration.name,configuration.id] + configurations = [] if (configurations.nil?) + @configuration_select = configurations.map do |configuration| + [configuration.name,configuration.id] end end diff --git a/plugins/mezuro/lib/mezuro_plugin/project_content.rb b/plugins/mezuro/lib/mezuro_plugin/project_content.rb index a9b58b9..3588386 100644 --- a/plugins/mezuro/lib/mezuro_plugin/project_content.rb +++ b/plugins/mezuro/lib/mezuro_plugin/project_content.rb @@ -41,7 +41,11 @@ class MezuroPlugin::ProjectContent < Article end def description - @description ||= project.description + begin + @description ||= project.description + rescue + @description = "" + end @description end @@ -79,6 +83,7 @@ class MezuroPlugin::ProjectContent < Article def create_kalibro_project Kalibro::Project.create( + :id => project_id, :name => name, :description => description ) diff --git a/plugins/mezuro/views/content_viewer/show_project.rhtml b/plugins/mezuro/views/content_viewer/show_project.rhtml index ea6d998..12043ee 100644 --- a/plugins/mezuro/views/content_viewer/show_project.rhtml +++ b/plugins/mezuro/views/content_viewer/show_project.rhtml @@ -1,6 +1,6 @@ <% @project = @page.project %> <% unless @page.errors[:base].nil? %> - <% if @page.errors[:base] =~ /There is no project named/ %> + <% if @page.errors[:base] == "Kalibro::Errors::RecordNotFound" %>
This project doesn't exist on the Web Service. Do you want to <%= link_to 'delete', :action => 'destroy', :controller => 'cms', :profile => @page.profile.identifier, :id => @page.id %> or <%= link_to 'save it again', :action => 'edit', :controller => 'cms', :profile => @page.profile.identifier, :id => @page.id %>?
<% else %> @@ -28,11 +28,16 @@ :action => "show", :id => @page.id, :repository_id => repository.id %> -