#55 popup edits

rwestgeest · Aug 11, 2013 · 7a95e30 · 7a95e30
1 parent 92ff241
commit 7a95e30
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/app/controllers/program_entries_controller.rb b/app/controllers/program_entries_controller.rb
@@ -26,6 +26,7 @@ def new
     respond_to do |format|
       format.html # new.html.erb
       format.json { render json: @program_entry }
+      format.js 
     end
   end
 
@@ -45,9 +46,11 @@ def create
       if @program_entry.save
         format.html { redirect_to  :controller => 'programs', :action => 'edit', :id =>  @program_entry.program.id  }
         format.json { render json: @program_entry, status: :created, location: @program_entry }
+        format.js 
       else
         format.html { render action: "new" }
         format.json { render json: @program_entry.errors, status: :unprocessable_entity }
+        format.js 
       end
     end
   end

diff --git a/app/views/program_entries/_show_in_program_matrix.html.erb b/app/views/program_entries/_show_in_program_matrix.html.erb
@@ -1,7 +1,9 @@
      <% if program_entry.nil? %>  
-       <td class="ProgramMatrix" > 
+       <td class="ProgramMatrix" id="ProgramMatrix_entry_<%=slot%>_<%=track%>"> 
          <% if editable %> 
-           <%= link_to 'add', new_program_program_entry_path(program, :slot => slot, :track => track  ), :class => "ProgramMatrix_edit_link" %>  
+           <%= link_to 'add', new_program_program_entry_path(program, :slot => slot, :track => track  ), 
+                       id: "program_entry_#{slot}_#{track}",
+                       :remote => true, :class => "ProgramMatrix_edit_link" %>  
          <% end %> 
        </td>
      <% else %> 
@@ -13,7 +15,9 @@
          <% end %> 
          <%= wikinize(program_entry.comment) %>
          <% if editable %> 
-           <%= link_to "edit", {controller: 'program_entries', action: 'edit', id: program_entry.to_param}, id: "program_entry_#{program_entry.id}" ,  :remote => true, :class => "ProgramMatrix_edit_link"  %>
+           <%= link_to "edit", {controller: 'program_entries', action: 'edit', id: program_entry.to_param}, 
+                       id: "program_entry_#{program_entry.id}",
+                       :remote => true, :class => "ProgramMatrix_edit_link"  %>
          <% end %> 
        </td>
      <% end %> 
diff --git a/app/views/program_entries/create.js.erb b/app/views/program_entries/create.js.erb
@@ -0,0 +1,3 @@
+$('<%="#new_program_entry"%>').remove();
+$('<%="#ProgramMatrix_entry_#{@program_entry.slot}_#{@program_entry.track}"%>').after("<%= j render 'show_in_program_matrix',  :program_entry => @program_entry, :program=> @program_entry.program, :slot=> @program_entry.slot, :track=> @program_entry.track, :editable=> true   %>");
+$('<%="#ProgramMatrix_entry_#{@program_entry.slot}_#{@program_entry.track}"%>').remove();
diff --git a/app/views/program_entries/new.js.erb b/app/views/program_entries/new.js.erb
@@ -0,0 +1,2 @@
+$('<%="#program_entry_#{@program_entry.slot}_#{@program_entry.track}"%>').hide().after('<%= j render("form_popup") %>');
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		$('<%="#program_entry_#{@program_entry.slot}_#{@program_entry.track}"%>').hide().after('<%= j render("form_popup") %>');