can add relation between co-author

This commit is contained in:
Rueshyna 2012-12-03 12:10:45 +08:00 committed by chris
parent 5dabfe9319
commit 7822ffc33d
18 changed files with 350 additions and 77 deletions

View File

@ -0,0 +1,32 @@
class Desktop::CoAuthorRelationsController < ApplicationController
def index
@co_author_relations = CoAuthorRelation.all
new
respond_to do |format|
format.html {render layout: false }
end
end
def new
@new_relation = CoAuthorRelation.new
end
def create
@new_relation = CoAuthorRelation.new(params[:co_author_relation])
if @new_relation.save
render json: {success:true, msg: "New Relation successfully saved!"}.to_json
else
error_msg = @new_relation.errors.full_messages.join("<br />")
render json: {success: false, msg: error_msg}.to_json
end
end
def destroy
@co_author_relation = CoAuthorRelation.find(params[:id])
@co_author_relation.destroy
render :json => {success: true, msg: "deleted successfully!"}
end
end

View File

@ -4,7 +4,6 @@ class Desktop::CoAuthorsController < ApplicationController
respond_to do |format| respond_to do |format|
format.html { render :layout => false} format.html { render :layout => false}
format.json { render json: @co_authors }
end end
end end

View File

@ -1,6 +1,5 @@
class Desktop::JournalListsController < ApplicationController class Desktop::JournalListsController < ApplicationController
# GET /desktop/journal_lists
# GET /desktop/journal_lists.json
def index def index
level_types = JournalLevelType.all level_types = JournalLevelType.all
all_journal_lists = WritingJournal.where(create_user_id: current_user.id) all_journal_lists = WritingJournal.where(create_user_id: current_user.id)
@ -18,76 +17,4 @@ class Desktop::JournalListsController < ApplicationController
format.html { render :layout => false} format.html { render :layout => false}
end end
end end
=begin
# GET /desktop/journal_lists/1
# GET /desktop/journal_lists/1.json
def show
@desktop_journal_list = Desktop::JournalList.find(params[:id])
respond_to do |format|
format.html # show.html.erb
format.json { render json: @desktop_journal_list }
end
end
# GET /desktop/journal_lists/new
# GET /desktop/journal_lists/new.json
def new
@desktop_journal_list = Desktop::JournalList.new
respond_to do |format|
format.html # new.html.erb
format.json { render json: @desktop_journal_list }
end
end
# GET /desktop/journal_lists/1/edit
def edit
@desktop_journal_list = Desktop::JournalList.find(params[:id])
end
# POST /desktop/journal_lists
# POST /desktop/journal_lists.json
def create
@desktop_journal_list = Desktop::JournalList.new(params[:desktop_journal_list])
respond_to do |format|
if @desktop_journal_list.save
format.html { redirect_to @desktop_journal_list, notice: 'Journal list was successfully created.' }
format.json { render json: @desktop_journal_list, status: :created, location: @desktop_journal_list }
else
format.html { render action: "new" }
format.json { render json: @desktop_journal_list.errors, status: :unprocessable_entity }
end
end
end
# PUT /desktop/journal_lists/1
# PUT /desktop/journal_lists/1.json
def update
@desktop_journal_list = Desktop::JournalList.find(params[:id])
respond_to do |format|
if @desktop_journal_list.update_attributes(params[:desktop_journal_list])
format.html { redirect_to @desktop_journal_list, notice: 'Journal list was successfully updated.' }
format.json { head :ok }
else
format.html { render action: "edit" }
format.json { render json: @desktop_journal_list.errors, status: :unprocessable_entity }
end
end
end
# DELETE /desktop/journal_lists/1
# DELETE /desktop/journal_lists/1.json
def destroy
@desktop_journal_list = Desktop::JournalList.find(params[:id])
@desktop_journal_list.destroy
respond_to do |format|
format.html { redirect_to desktop_journal_lists_url }
format.json { head :ok }
end
end
=end
end end

View File

@ -0,0 +1,2 @@
module Desktop::CoAuthorRelationsHelper
end

View File

@ -8,6 +8,7 @@ class CoAuthor
field :email field :email
field :type field :type
has_and_belongs_to_many :co_author_relations
VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/ VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/
validates :email, format: { with: VALID_EMAIL_REGEX }, validates :email, format: { with: VALID_EMAIL_REGEX },

View File

@ -0,0 +1,8 @@
class CoAuthorRelation
include Mongoid::Document
include Mongoid::Timestamps
field :relation, localize: true
has_and_belongs_to_many :co_authors
end

View File

@ -0,0 +1,4 @@
<%= form_for(@new_relation , url: desktop_co_author_relations_path ) do |f| %>
<%= f.text_field :relation %>
<%= f.submit "Save" %>
<% end %>

View File

@ -0,0 +1,18 @@
<h1>Listing co_author_relations</h1>
<%= render 'form' %>
<table>
<tr>
<th>Relation</th>
<th></th>
<th></th>
</tr>
<% @co_author_relations.each do |co_author_relation| %>
<tr>
<td><%= co_author_relation.relation %></td>
<td><%= link_to 'Destroy', desktop_co_author_relation_path(co_author_relation), confirm: 'Are you sure?', method: :delete %></td>
</tr>
<% end %>
</table>

View File

@ -1,6 +1,6 @@
<h1>list all coauthor</h1> <h1>list all coauthor</h1>
<%= link_to "New Co-Author", new_desktop_co_author_path %> <%= link_to "New Co-Author", new_desktop_co_author_path %>
<%= link_to "New Type", "#" %> <%= link_to "New Type", desktop_co_author_relations_path %>
<table> <table>
<tr> <tr>
<th>Name</th> <th>Name</th>

View File

@ -164,7 +164,6 @@ Orbit::Application.routes.draw do
namespace :desktop do namespace :desktop do
match "desktop" => "desktop#desktop" match "desktop" => "desktop#desktop"
match '/journal_pages/get_journals_json' => 'journal_pages#get_journals_json' match '/journal_pages/get_journals_json' => 'journal_pages#get_journals_json'
match '/co_authors/get_co_authors_json' => 'co_authors#get_co_authors_json'
match '/desktop'=>'desktop#desktop' match '/desktop'=>'desktop#desktop'
match '/app_manager'=>'desktop#app_manager' match '/app_manager'=>'desktop#app_manager'
match '/sections'=>'desktop#sections' match '/sections'=>'desktop#sections'
@ -184,6 +183,7 @@ Orbit::Application.routes.draw do
resources :journal_pages resources :journal_pages
resources :journal_lists resources :journal_lists
resources :co_authors resources :co_authors
resources :co_author_relations
end end
# namespace :desktop_publications do # namespace :desktop_publications do

View File

@ -0,0 +1,164 @@
require 'spec_helper'
# This spec was generated by rspec-rails when you ran the scaffold generator.
# It demonstrates how one might use RSpec to specify the controller code that
# was generated by Rails when you ran the scaffold generator.
#
# It assumes that the implementation code is generated by the rails scaffold
# generator. If you are using any extension libraries to generate different
# controller code, this generated spec may or may not pass.
#
# It only uses APIs available in rails and/or rspec-rails. There are a number
# of tools you can use to make these specs even more expressive, but we're
# sticking to rails and rspec-rails APIs to keep things simple and stable.
#
# Compared to earlier versions of this generator, there is very limited use of
# stubs and message expectations in this spec. Stubs are only used when there
# is no simpler way to get a handle on the object needed for the example.
# Message expectations are only used when there is no simpler way to specify
# that an instance is receiving a specific message.
describe Desktop::CoAuthorRelationsController do
# This should return the minimal set of attributes required to create a valid
# Desktop::CoAuthorRelation. As you add validations to Desktop::CoAuthorRelation, be sure to
# update the return value of this method accordingly.
def valid_attributes
{}
end
# This should return the minimal set of values that should be in the session
# in order to pass any filters (e.g. authentication) defined in
# Desktop::CoAuthorRelationsController. Be sure to keep this updated too.
def valid_session
{}
end
describe "GET index" do
it "assigns all desktop_co_author_relations as @desktop_co_author_relations" do
co_author_relation = Desktop::CoAuthorRelation.create! valid_attributes
get :index, {}, valid_session
assigns(:desktop_co_author_relations).should eq([co_author_relation])
end
end
describe "GET show" do
it "assigns the requested desktop_co_author_relation as @desktop_co_author_relation" do
co_author_relation = Desktop::CoAuthorRelation.create! valid_attributes
get :show, {:id => co_author_relation.to_param}, valid_session
assigns(:desktop_co_author_relation).should eq(co_author_relation)
end
end
describe "GET new" do
it "assigns a new desktop_co_author_relation as @desktop_co_author_relation" do
get :new, {}, valid_session
assigns(:desktop_co_author_relation).should be_a_new(Desktop::CoAuthorRelation)
end
end
describe "GET edit" do
it "assigns the requested desktop_co_author_relation as @desktop_co_author_relation" do
co_author_relation = Desktop::CoAuthorRelation.create! valid_attributes
get :edit, {:id => co_author_relation.to_param}, valid_session
assigns(:desktop_co_author_relation).should eq(co_author_relation)
end
end
describe "POST create" do
describe "with valid params" do
it "creates a new Desktop::CoAuthorRelation" do
expect {
post :create, {:desktop_co_author_relation => valid_attributes}, valid_session
}.to change(Desktop::CoAuthorRelation, :count).by(1)
end
it "assigns a newly created desktop_co_author_relation as @desktop_co_author_relation" do
post :create, {:desktop_co_author_relation => valid_attributes}, valid_session
assigns(:desktop_co_author_relation).should be_a(Desktop::CoAuthorRelation)
assigns(:desktop_co_author_relation).should be_persisted
end
it "redirects to the created desktop_co_author_relation" do
post :create, {:desktop_co_author_relation => valid_attributes}, valid_session
response.should redirect_to(Desktop::CoAuthorRelation.last)
end
end
describe "with invalid params" do
it "assigns a newly created but unsaved desktop_co_author_relation as @desktop_co_author_relation" do
# Trigger the behavior that occurs when invalid params are submitted
Desktop::CoAuthorRelation.any_instance.stub(:save).and_return(false)
post :create, {:desktop_co_author_relation => {}}, valid_session
assigns(:desktop_co_author_relation).should be_a_new(Desktop::CoAuthorRelation)
end
it "re-renders the 'new' template" do
# Trigger the behavior that occurs when invalid params are submitted
Desktop::CoAuthorRelation.any_instance.stub(:save).and_return(false)
post :create, {:desktop_co_author_relation => {}}, valid_session
response.should render_template("new")
end
end
end
describe "PUT update" do
describe "with valid params" do
it "updates the requested desktop_co_author_relation" do
co_author_relation = Desktop::CoAuthorRelation.create! valid_attributes
# Assuming there are no other desktop_co_author_relations in the database, this
# specifies that the Desktop::CoAuthorRelation created on the previous line
# receives the :update_attributes message with whatever params are
# submitted in the request.
Desktop::CoAuthorRelation.any_instance.should_receive(:update_attributes).with({'these' => 'params'})
put :update, {:id => co_author_relation.to_param, :desktop_co_author_relation => {'these' => 'params'}}, valid_session
end
it "assigns the requested desktop_co_author_relation as @desktop_co_author_relation" do
co_author_relation = Desktop::CoAuthorRelation.create! valid_attributes
put :update, {:id => co_author_relation.to_param, :desktop_co_author_relation => valid_attributes}, valid_session
assigns(:desktop_co_author_relation).should eq(co_author_relation)
end
it "redirects to the desktop_co_author_relation" do
co_author_relation = Desktop::CoAuthorRelation.create! valid_attributes
put :update, {:id => co_author_relation.to_param, :desktop_co_author_relation => valid_attributes}, valid_session
response.should redirect_to(co_author_relation)
end
end
describe "with invalid params" do
it "assigns the desktop_co_author_relation as @desktop_co_author_relation" do
co_author_relation = Desktop::CoAuthorRelation.create! valid_attributes
# Trigger the behavior that occurs when invalid params are submitted
Desktop::CoAuthorRelation.any_instance.stub(:save).and_return(false)
put :update, {:id => co_author_relation.to_param, :desktop_co_author_relation => {}}, valid_session
assigns(:desktop_co_author_relation).should eq(co_author_relation)
end
it "re-renders the 'edit' template" do
co_author_relation = Desktop::CoAuthorRelation.create! valid_attributes
# Trigger the behavior that occurs when invalid params are submitted
Desktop::CoAuthorRelation.any_instance.stub(:save).and_return(false)
put :update, {:id => co_author_relation.to_param, :desktop_co_author_relation => {}}, valid_session
response.should render_template("edit")
end
end
end
describe "DELETE destroy" do
it "destroys the requested desktop_co_author_relation" do
co_author_relation = Desktop::CoAuthorRelation.create! valid_attributes
expect {
delete :destroy, {:id => co_author_relation.to_param}, valid_session
}.to change(Desktop::CoAuthorRelation, :count).by(-1)
end
it "redirects to the desktop_co_author_relations list" do
co_author_relation = Desktop::CoAuthorRelation.create! valid_attributes
delete :destroy, {:id => co_author_relation.to_param}, valid_session
response.should redirect_to(desktop_co_author_relations_url)
end
end
end

View File

@ -0,0 +1,15 @@
require 'spec_helper'
# Specs in this file have access to a helper object that includes
# the Desktop::CoAuthorRelationsHelper. For example:
#
# describe Desktop::CoAuthorRelationsHelper do
# describe "string concat" do
# it "concats two strings with spaces" do
# helper.concat_strings("this","that").should == "this that"
# end
# end
# end
describe Desktop::CoAuthorRelationsHelper do
pending "add some examples to (or delete) #{__FILE__}"
end

View File

@ -0,0 +1,11 @@
require 'spec_helper'
describe "Desktop::CoAuthorRelations" do
describe "GET /desktop_co_author_relations" do
it "works! (now write some real specs)" do
# Run the generator again with the --webrat flag if you want to use webrat methods/matchers
get desktop_co_author_relations_path
response.status.should be(200)
end
end
end

View File

@ -0,0 +1,35 @@
require "spec_helper"
describe Desktop::CoAuthorRelationsController do
describe "routing" do
it "routes to #index" do
get("/desktop/co_author_relations").should route_to("desktop/co_author_relations#index")
end
it "routes to #new" do
get("/desktop/co_author_relations/new").should route_to("desktop/co_author_relations#new")
end
it "routes to #show" do
get("/desktop/co_author_relations/1").should route_to("desktop/co_author_relations#show", :id => "1")
end
it "routes to #edit" do
get("/desktop/co_author_relations/1/edit").should route_to("desktop/co_author_relations#edit", :id => "1")
end
it "routes to #create" do
post("/desktop/co_author_relations").should route_to("desktop/co_author_relations#create")
end
it "routes to #update" do
put("/desktop/co_author_relations/1").should route_to("desktop/co_author_relations#update", :id => "1")
end
it "routes to #destroy" do
delete("/desktop/co_author_relations/1").should route_to("desktop/co_author_relations#destroy", :id => "1")
end
end
end

View File

@ -0,0 +1,15 @@
require 'spec_helper'
describe "desktop/co_author_relations/edit" do
before(:each) do
@desktop_co_author_relation = assign(:desktop_co_author_relation, stub_model(Desktop::CoAuthorRelation))
end
it "renders the edit desktop_co_author_relation form" do
render
# Run the generator again with the --webrat flag if you want to use webrat matchers
assert_select "form", :action => desktop_co_author_relations_path(@desktop_co_author_relation), :method => "post" do
end
end
end

View File

@ -0,0 +1,15 @@
require 'spec_helper'
describe "desktop/co_author_relations/index" do
before(:each) do
assign(:desktop_co_author_relations, [
stub_model(Desktop::CoAuthorRelation),
stub_model(Desktop::CoAuthorRelation)
])
end
it "renders a list of desktop/co_author_relations" do
render
# Run the generator again with the --webrat flag if you want to use webrat matchers
end
end

View File

@ -0,0 +1,15 @@
require 'spec_helper'
describe "desktop/co_author_relations/new" do
before(:each) do
assign(:desktop_co_author_relation, stub_model(Desktop::CoAuthorRelation).as_new_record)
end
it "renders new desktop_co_author_relation form" do
render
# Run the generator again with the --webrat flag if you want to use webrat matchers
assert_select "form", :action => desktop_co_author_relations_path, :method => "post" do
end
end
end

View File

@ -0,0 +1,12 @@
require 'spec_helper'
describe "desktop/co_author_relations/show" do
before(:each) do
@desktop_co_author_relation = assign(:desktop_co_author_relation, stub_model(Desktop::CoAuthorRelation))
end
it "renders attributes in <p>" do
render
# Run the generator again with the --webrat flag if you want to use webrat matchers
end
end