@@ -1,3 +1,5 @@ +06/16/08 - fixed partial rendering calls that had been missed during RC3 refactoring [Matthew Bass] + 05/07/08 - added quick_show_button option for hiding the show button on the list view [Matthew Bass] 1.0RC03 -- 02/29/08 CHANGELOG @@ -23,7 +23,7 @@ <div id="left"> <%= render(:partial => "shared/streamlined/side_menu")%> <% if advanced_filtering %> - <%= render :file => STREAMLINED_TEMPLATE_ROOT + '/shared/_filter' %> + <%= render_streamlined_file '/shared/_filter.rhtml' %> <% end %> </div> <div id="center"> faux_rails_root/app/views/layouts/streamlined.rhtml @@ -90,9 +90,8 @@ class Streamlined::Column::Association < Streamlined::Column::Base end def render_td_show(view, item) - view.render(:partial => show_view.partial, - :locals => { :item => item, :relationship => self, - :streamlined_def => show_view }) + view.render(:file => show_view.partial, :use_full_path => false, + :locals => { :item => item, :relationship => self, :streamlined_def => show_view }) end def render_td_list(view, item) lib/streamlined/column/association.rb @@ -7,7 +7,8 @@ module Streamlined::Controller::EnumerationMethods rel_type = model_ui.scalars[@enumeration_name.to_sym] @all_items = rel_type.enumeration.to_2d_array @selected_item = instance.send(@enumeration_name) - render(:partial => rel_type.edit_view.partial, :locals => {:item => instance, :relationship => rel_type}) + render(:file => rel_type.edit_view.partial, :use_full_path => false, + :locals => {:item => instance, :relationship => rel_type}) end # Show's the enumeration's configured +Show+ view, @@ -15,7 +16,8 @@ module Streamlined::Controller::EnumerationMethods def show_enumeration self.instance = model.find(params[:id]) rel_type = model_ui.scalars[params[:enumeration].to_sym] - render(:partial => rel_type.show_view.partial, :locals => {:item => instance, :relationship => rel_type}) + render(:file => rel_type.show_view.partial, :use_full_path => false, + :locals => {:item => instance, :relationship => rel_type}) end # Select an item in the given enumeration. Used by the #enumerable view, as lib/streamlined/controller/enumeration_methods.rb @@ -7,7 +7,8 @@ module Streamlined::Controller::RelationshipMethods @rel_name = params[:relationship] relationship = context_column(@rel_name) set_items_and_all_items(relationship) - render(:partial => relationship.edit_view.partial, :locals => {:relationship => relationship}) + render(:file => relationship.edit_view.partial, :use_full_path => false, + :locals => {:relationship => relationship}) end # Show's the relationship's configured +Show+ view, @@ -19,9 +20,9 @@ module Streamlined::Controller::RelationshipMethods end def render_show_view_partial(relationship, item) - render(:partial => relationship.show_view.partial, :locals => {:item => item, - :relationship => relationship, - :streamlined_def => relationship.show_view}) + render(:file => relationship.show_view.partial, :use_full_path => false, + :locals => {:item => item, :relationship => relationship, + :streamlined_def => relationship.show_view}) end # Add new items to the given relationship collection. Used by the #membership view, as lib/streamlined/controller/relationship_methods.rb @@ -25,7 +25,8 @@ class Streamlined::View::Base # Returns the path to the partial that will be used to render this relationship type. def partial mod = self.class.name.split("::")[-2] -"../../vendor/plugins/streamlined/templates/relationships/#{mod.underscore}/#{Inflector.underscore(Inflector.demodulize(self.class.name))}" + partial_name = Inflector.underscore(Inflector.demodulize(self.class.name)) + File.join(STREAMLINED_TEMPLATE_ROOT, "relationships/#{mod.underscore}/_#{partial_name}.rhtml") end end lib/streamlined/view/base.rb @@ -22,8 +22,8 @@ module Streamlined::View::EditViews # Renders an Ajax-enabled table in a JavaScript window. class Window < Streamlined::View::Base - def partial - "../../vendor/plugins/streamlined/templates/relationships/edit_views/inset_table" + def partial + File.join(STREAMLINED_TEMPLATE_ROOT, "relationships/edit_views/_inset_table.rhtml") end end @@ -44,15 +44,11 @@ module Streamlined::View::EditViews # Like Membership, but with two distinct groups of checkboxes and an autofilter field class FilterSelect < Streamlined::View::Base - def render_on_update(rel_name, id) @rel_name = rel_name @current_id = id "update_filter_select" - # page.replace_html "rel_#{rel_name}_#{id}_unselected", :partial => '../../vendor/plugins/streamlined/templates/relationships/edit_views/filter_select/unselected_items' - # page.replace_html "rel_#{rel_name}_#{id}_selected", :partial => '../../vendor/plugins/streamlined/templates/relationships/edit_views/filter_select/selected_items' end - end end lib/streamlined/view/edit_views.rb @@ -8,7 +8,7 @@ xml.tag! Inflector.pluralize(model_name) do @export_columns.each do |column| if column.is_displayable_in_context?(self, item) if column.is_a?(Streamlined::Column::Association) - contents = render(:partial => column.show_view.partial, + contents = render(:file => column.show_view.partial, :use_full_path => false, :locals => { :item => item, :relationship => column, :streamlined_def => column.show_view }) # strip out html tags templates/generic_views/list.rxml @@ -1,2 +1,2 @@ -page.replace_html "rel_#{@rel_name}_#{@current_id}_unselected", :partial => '../../vendor/plugins/streamlined/templates/relationships/edit_views/filter_select/unselected_items' -page.replace_html "rel_#{@rel_name}_#{@current_id}_selected", :partial => '../../vendor/plugins/streamlined/templates/relationships/edit_views/filter_select/selected_items' +page.replace_html "rel_#{@rel_name}_#{@current_id}_unselected", :file => File.join(STREAMLINED_TEMPLATE_ROOT, 'relationships/edit_views/filter_select/_unselected_items.rhtml', :use_full_path => false +page.replace_html "rel_#{@rel_name}_#{@current_id}_selected", :file => File.join(STREAMLINED_TEMPLATE_ROOT, 'relationships/edit_views/filter_select/_selected_items.rhtml', :use_full_path => false templates/generic_views/update_filter_select.rjs @@ -5,11 +5,11 @@ <input type="hidden" name="rel_name" value="<%= @rel_name %>"> <input type="hidden" name="klass" value="<%= @klass %>"> <div id="rel_<%= @rel_name %>_<%= @root.id %>_unselected" class="streamlined_relationship"> - <%= render :partial => '../../vendor/plugins/streamlined/templates/relationships/edit_views/filter_select/unselected_items' %> + <%= render_streamlined_file '/relationships/edit_views/filter_select/_unselected_items.rhtml' %> </div> <hr> <div id="rel_<%= @rel_name %>_<%= @root.id %>_selected"> -<%= render :partial => '../../vendor/plugins/streamlined/templates/relationships/edit_views/filter_select/selected_items' %> +<%= render_streamlined_file '/relationships/edit_views/filter_select/_selected_items.rhtml' %> </div> </form> <%= observe_form "rel_#{@rel_name}_#{@root.id}", templates/relationships/edit_views/_filter_select.rhtml @@ -52,7 +52,7 @@ private @rel_type = flexmock(:enumeration => options[:enumeration], :edit_view => edit_view, :show_view => show_view) (model = flexmock).should_receive(:find).with('123').and_return(@item).once - (model_ui = flexmock).should_receive(:scalars).and_return(:foo => @rel_type).once + (model_ui = flexmock).stubs(:scalars).returns(:foo => @rel_type) flexmock(self, :model => model) flexmock(self, :model_ui => model_ui) @@ -60,7 +60,7 @@ private end def should_render_with_partial(partial) - render_options = { :partial => partial, :locals => { :item => @item, :relationship => @rel_type }} + render_options = { :file => partial, :use_full_path => false, :locals => { :item => @item, :relationship => @rel_type }} flexmock(self).should_receive(:render).with(render_options).and_return('render_results').once end test/functional/streamlined/controller/enumeration_methods_test.rb @@ -31,7 +31,7 @@ describe "Streamlined::Controller::RelationshipMethods" do show_view = flexmock('show_view', :partial => :partial) relationship = flexmock('relationship', :show_view => show_view) flexmock(@inst) do |mock| - mock.should_receive(:render).with(:partial => :partial, :locals => {:item => :item, :relationship => relationship, :streamlined_def => show_view}).once + mock.should_receive(:render).with(:file => :partial, :use_full_path => false, :locals => {:item => :item, :relationship => relationship, :streamlined_def => show_view}).once end @inst.render_show_view_partial(relationship, :item) end @@ -43,7 +43,7 @@ describe "Streamlined::Controller::RelationshipMethods" do mock.should_receive(:model).and_return(flexmock('model', :find => nil)) mock.should_receive(:context_column).and_return(rel_type).once mock.should_receive(:set_items_and_all_items).with(rel_type).once - expected_render_args = { :partial => 'partial', :locals => { :relationship => rel_type }} + expected_render_args = { :file => 'partial', :use_full_path => false, :locals => { :relationship => rel_type }} mock.should_receive(:render).with(expected_render_args).once end @inst.edit_relationship test/unit/streamlined/controller/relationship_methods_test.rb @@ -15,6 +15,6 @@ describe "Streamlined::View::Base" do end it "partial" do - assert_equal "../../vendor/plugins/streamlined/templates/relationships/view/base", @base.partial + assert_equal "#{STREAMLINED_TEMPLATE_ROOT}/relationships/view/_base.rhtml", @base.partial end end \ No newline at end of file test/unit/streamlined/view/base_test.rb 1f2b03008f8b51b5f9e70936eda1441892bbcf17 matthew matthew@4f249914-c612-0410-8deb-f4485a9d85ab http://github.com/relevance/streamlined/commit/4217493fa76901f5febce33d059224ff4938e437 4217493fa76901f5febce33d059224ff4938e437 2008-06-16T14:38:56-07:00 2008-06-16T14:38:56-07:00 fixed partial rendering calls that had been missed during RC3 refactoring 829ccc768d0f167333762ee02f7206fdb66b5a9b matthew matthew@4f249914-c612-0410-8deb-f4485a9d85ab