Merge branch 'new' of github.com:Rulingcom/orbit into new
This commit is contained in:
		
						commit
						1a76d5d3cb
					
				| 
						 | 
					@ -229,7 +229,7 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC
 | 
				
			||||||
      if @writing_journal.save
 | 
					      if @writing_journal.save
 | 
				
			||||||
	  
 | 
						  
 | 
				
			||||||
		if params[:writing_journal][:user_id]
 | 
							if params[:writing_journal][:user_id]
 | 
				
			||||||
          format.html { redirect_to(admin_users_new_interface_url(:id=>params[:writing_journal][:user_id],:show_plugin_profile=>Journal)) }
 | 
					          format.html { redirect_to(admin_users_new_interface_url(:id=>params[:writing_journal][:user_id],:show_plugin_profile=>'Journal')) }
 | 
				
			||||||
        else
 | 
					        else
 | 
				
			||||||
		  format.html { redirect_to(panel_personal_journal_back_end_writing_journals_url) }
 | 
							  format.html { redirect_to(panel_personal_journal_back_end_writing_journals_url) }
 | 
				
			||||||
        end
 | 
					        end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in New Issue