diff --git a/db/seeds.rb b/db/seeds.rb index 607884650..91469233c 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -19,15 +19,30 @@ WritingJournal.destroy_all end 10.times do - FactoryGirl.create(:relations) + FactoryGirl.create(:journal_relation) end 50.times do - FactoryGirl.create(:paper_record) + FactoryGirl.create(:journal) end 50.times do - FactoryGirl.create(:co_author_candidate) + FactoryGirl.create(:journal_co_author) end +10.size.times do + FactoryGirl.create(:conference_level) +end + +10.times do + FactoryGirl.create(:conference_relation) +end + +50.times do + FactoryGirl.create(:conference) +end + +50.times do + FactoryGirl.create(:conference_co_author) +end puts "Success!" diff --git a/vendor/built_in_modules/personal_journal/spec/factories/co_author_relations.rb b/vendor/built_in_modules/personal_conference/spec/factories/co_author_relations.rb similarity index 100% rename from vendor/built_in_modules/personal_journal/spec/factories/co_author_relations.rb rename to vendor/built_in_modules/personal_conference/spec/factories/co_author_relations.rb diff --git a/vendor/built_in_modules/personal_journal/spec/factories/co_authors.rb b/vendor/built_in_modules/personal_conference/spec/factories/co_authors.rb similarity index 100% rename from vendor/built_in_modules/personal_journal/spec/factories/co_authors.rb rename to vendor/built_in_modules/personal_conference/spec/factories/co_authors.rb diff --git a/vendor/built_in_modules/personal_conference/spec/factories/journal_level_types.rb b/vendor/built_in_modules/personal_conference/spec/factories/journal_level_types.rb new file mode 100644 index 000000000..631a39c9e --- /dev/null +++ b/vendor/built_in_modules/personal_conference/spec/factories/journal_level_types.rb @@ -0,0 +1,10 @@ + +level = ["SCI", "SCIE", "SSCI", "AH & HCI", "EI", "CSCI", "CSSCI", "TSCI", "TSSCI", "THCI"] +FactoryGirl.define do + factory(:journal_level, class: "JournalLevelType") do |f| + f.sequence(:title_translations) do |n| + { zh_tw: "#{level[n]}", + en: "#{level[n]}" } + end + end +end diff --git a/vendor/built_in_modules/personal_conference/spec/factories/writing_conference_files.rb b/vendor/built_in_modules/personal_conference/spec/factories/writing_conference_files.rb new file mode 100644 index 000000000..67c47e3dc --- /dev/null +++ b/vendor/built_in_modules/personal_conference/spec/factories/writing_conference_files.rb @@ -0,0 +1,18 @@ + +file_desc = Array.new 7, "" +file_desc = file_desc.map do |p| Faker::Lorem.word end + +file = ["1.png", "5.pdf", "2.png", "6.pdf", "3.png", "7.pdf", "4.png"] + +rand = Random.new + +FactoryGirl.define do + factory(:upload_file, class: "WritingJournalFile") do |f| + f.sequence(:file) do |n| + File.new(File.join(Rails.root, "db" ,"files", file[rand.rand(0..6)])) + end + f.sequence(:title) do |n| + "#{file_desc[rand.rand(0..6)]}" + end + end +end diff --git a/vendor/built_in_modules/personal_conference/spec/factories/writing_conferences.rb b/vendor/built_in_modules/personal_conference/spec/factories/writing_conferences.rb new file mode 100644 index 000000000..3c9b20cab --- /dev/null +++ b/vendor/built_in_modules/personal_conference/spec/factories/writing_conferences.rb @@ -0,0 +1,75 @@ +require 'json' + + +data = File.read("#{Rails.root}/db/data") +data_json = JSON.parse(data) + +rand = Random.new + +FactoryGirl.define do + factory :paper_record, class: "WritingJournal" do |f| + f.sequence(:paper_title_translations) do |n| + { zh_tw: "#{data_json[n]["paper_title"]}_tw", + en: "#{data_json[n]["paper_title"]}_en" } + end + + f.sequence(:journal_title_translations) do |n| + {zh_tw: "#{data_json[n]["booktitle"]}_tw", + en: "#{data_json[n]["booktitle"]}_en"} + end + + f.sequence(:abstract) do |n| + "#{data_json[n]["abstract"]}" + end + + f.sequence(:isbn) do |n| + "#{data_json[n]["isbn"]}" + end + + f.sequence(:year) do |n| + "#{data_json[n]["year"]}" + end + + f.sequence(:authors) do |n| + "#{data_json[n]["author"].map{|m| m.split(",").reverse.join(" ")}.join(",")}" + end + + f.sequence(:form_to_start) do |n| + "#{data_json[n]["page_from"]}" + end + + f.sequence(:form_to_end) do |n| + "#{data_json[n]["page_to"]}" + end + + f.sequence(:total_pages) do |n| + "#{data_json[n]["total_page"]}" + end + + f.sequence(:language) do |n| + "#{data_json[n]["language"]}" + end + + f.sequence(:keywords) do |n| + "#{data_json[n]["abstract"].split[-3..-1].join(",")}" + end + + f.sequence(:journal_level_types) do |n| + level = [] + total_levels = rand.rand(1..JournalLevelType.count) + total_levels.times do + level << JournalLevelType.all[rand.rand(0..JournalLevelType.count-1)] + end + level.uniq + end + + f.sequence(:writing_journal_files) do |n| + files = [] + total_files = rand.rand(1..7) + total_files.times do files << FactoryGirl.create(:upload_file) end + files + end + f.create_user_id BSON::ObjectId('4f45f3b9e9d02c5db9000067') #user_id, this is Chris' account + f.update_user_id BSON::ObjectId('4f45f3b9e9d02c5db9000067') #user_id, this is Chris' account + end + end diff --git a/vendor/built_in_modules/personal_conference/test/dummy/Rakefile b/vendor/built_in_modules/personal_conference/test/dummy/Rakefile deleted file mode 100644 index 36458522c..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/Rakefile +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env rake -# Add your own tasks in files placed in lib/tasks ending in .rake, -# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. - -require File.expand_path('../config/application', __FILE__) - -Dummy::Application.load_tasks diff --git a/vendor/built_in_modules/personal_conference/test/dummy/app/assets/javascripts/application.js b/vendor/built_in_modules/personal_conference/test/dummy/app/assets/javascripts/application.js deleted file mode 100644 index 37c7bfcdb..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/app/assets/javascripts/application.js +++ /dev/null @@ -1,9 +0,0 @@ -// This is a manifest file that'll be compiled into including all the files listed below. -// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically -// be included in the compiled file accessible from http://example.com/assets/application.js -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// the compiled file. -// -//= require jquery -//= require jquery_ujs -//= require_tree . diff --git a/vendor/built_in_modules/personal_conference/test/dummy/app/assets/stylesheets/application.css b/vendor/built_in_modules/personal_conference/test/dummy/app/assets/stylesheets/application.css deleted file mode 100644 index fc25b5723..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/app/assets/stylesheets/application.css +++ /dev/null @@ -1,7 +0,0 @@ -/* - * This is a manifest file that'll automatically include all the stylesheets available in this directory - * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at - * the top of the compiled file, but it's generally better to create a new file per style scope. - *= require_self - *= require_tree . -*/ \ No newline at end of file diff --git a/vendor/built_in_modules/personal_conference/test/dummy/app/controllers/application_controller.rb b/vendor/built_in_modules/personal_conference/test/dummy/app/controllers/application_controller.rb deleted file mode 100644 index e8065d950..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/app/controllers/application_controller.rb +++ /dev/null @@ -1,3 +0,0 @@ -class ApplicationController < ActionController::Base - protect_from_forgery -end diff --git a/vendor/built_in_modules/personal_conference/test/dummy/app/helpers/application_helper.rb b/vendor/built_in_modules/personal_conference/test/dummy/app/helpers/application_helper.rb deleted file mode 100644 index de6be7945..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/app/helpers/application_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApplicationHelper -end diff --git a/vendor/built_in_modules/personal_conference/test/dummy/app/mailers/.gitkeep b/vendor/built_in_modules/personal_conference/test/dummy/app/mailers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/vendor/built_in_modules/personal_conference/test/dummy/app/models/.gitkeep b/vendor/built_in_modules/personal_conference/test/dummy/app/models/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/vendor/built_in_modules/personal_conference/test/dummy/app/views/layouts/application.html.erb b/vendor/built_in_modules/personal_conference/test/dummy/app/views/layouts/application.html.erb deleted file mode 100644 index 9a8a761bd..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/app/views/layouts/application.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - Dummy - <%= stylesheet_link_tag "application" %> - <%= javascript_include_tag "application" %> - <%= csrf_meta_tags %> - - - -<%= yield %> - - - diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config.ru b/vendor/built_in_modules/personal_conference/test/dummy/config.ru deleted file mode 100644 index 1989ed8d0..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config.ru +++ /dev/null @@ -1,4 +0,0 @@ -# This file is used by Rack-based servers to start the application. - -require ::File.expand_path('../config/environment', __FILE__) -run Dummy::Application diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config/application.rb b/vendor/built_in_modules/personal_conference/test/dummy/config/application.rb deleted file mode 100644 index 82ff29a4a..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config/application.rb +++ /dev/null @@ -1,45 +0,0 @@ -require File.expand_path('../boot', __FILE__) - -require 'rails/all' - -Bundler.require -require "personal_conference" - -module Dummy - class Application < Rails::Application - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - - # Custom directories with classes and modules you want to be autoloadable. - # config.autoload_paths += %W(#{config.root}/extras) - - # Only load the plugins named here, in the order given (default is alphabetical). - # :all can be used as a placeholder for all plugins not explicitly named. - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - - # Activate observers that should always be running. - # config.active_record.observers = :cacher, :garbage_collector, :forum_observer - - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. - # config.time_zone = 'Central Time (US & Canada)' - - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de - - # Configure the default encoding used in templates for Ruby 1.9. - config.encoding = "utf-8" - - # Configure sensitive parameters which will be filtered from the log file. - config.filter_parameters += [:password] - - # Enable the asset pipeline - config.assets.enabled = true - - # Version of your assets, change this if you want to expire all your assets - config.assets.version = '1.0' - end -end - diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config/boot.rb b/vendor/built_in_modules/personal_conference/test/dummy/config/boot.rb deleted file mode 100644 index eba068137..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config/boot.rb +++ /dev/null @@ -1,10 +0,0 @@ -require 'rubygems' -gemfile = File.expand_path('../../../../Gemfile', __FILE__) - -if File.exist?(gemfile) - ENV['BUNDLE_GEMFILE'] = gemfile - require 'bundler' - Bundler.setup -end - -$:.unshift File.expand_path('../../../../lib', __FILE__) \ No newline at end of file diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config/database.yml b/vendor/built_in_modules/personal_conference/test/dummy/config/database.yml deleted file mode 100644 index 51a4dd459..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config/database.yml +++ /dev/null @@ -1,25 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -development: - adapter: sqlite3 - database: db/development.sqlite3 - pool: 5 - timeout: 5000 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - adapter: sqlite3 - database: db/test.sqlite3 - pool: 5 - timeout: 5000 - -production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 - timeout: 5000 diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config/environment.rb b/vendor/built_in_modules/personal_conference/test/dummy/config/environment.rb deleted file mode 100644 index 3da5eb91d..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config/environment.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Load the rails application -require File.expand_path('../application', __FILE__) - -# Initialize the rails application -Dummy::Application.initialize! diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config/environments/development.rb b/vendor/built_in_modules/personal_conference/test/dummy/config/environments/development.rb deleted file mode 100644 index 95a50b91e..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config/environments/development.rb +++ /dev/null @@ -1,30 +0,0 @@ -Dummy::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # In the development environment your application's code is reloaded on - # every request. This slows down response time but is perfect for development - # since you don't have to restart the web server when you make code changes. - config.cache_classes = false - - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - - # Don't care if the mailer can't send - config.action_mailer.raise_delivery_errors = false - - # Print deprecation notices to the Rails logger - config.active_support.deprecation = :log - - # Only use best-standards-support built into browsers - config.action_dispatch.best_standards_support = :builtin - - # Do not compress assets - config.assets.compress = false - - # Expands the lines which load the assets - config.assets.debug = true -end diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config/environments/production.rb b/vendor/built_in_modules/personal_conference/test/dummy/config/environments/production.rb deleted file mode 100644 index ca2c58883..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config/environments/production.rb +++ /dev/null @@ -1,60 +0,0 @@ -Dummy::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # Code is not reloaded between requests - config.cache_classes = true - - # Full error reports are disabled and caching is turned on - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Disable Rails's static asset server (Apache or nginx will already do this) - config.serve_static_assets = false - - # Compress JavaScripts and CSS - config.assets.compress = true - - # Don't fallback to assets pipeline if a precompiled asset is missed - config.assets.compile = false - - # Generate digests for assets URLs - config.assets.digest = true - - # Defaults to Rails.root.join("public/assets") - # config.assets.manifest = YOUR_PATH - - # Specifies the header that your server uses for sending files - # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true - - # See everything in the log (default is :info) - # config.log_level = :debug - - # Use a different logger for distributed setups - # config.logger = SyslogLogger.new - - # Use a different cache store in production - # config.cache_store = :mem_cache_store - - # Enable serving of images, stylesheets, and JavaScripts from an asset server - # config.action_controller.asset_host = "http://assets.example.com" - - # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) - # config.assets.precompile += %w( search.js ) - - # Disable delivery errors, bad email addresses will be ignored - # config.action_mailer.raise_delivery_errors = false - - # Enable threaded mode - # config.threadsafe! - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners - config.active_support.deprecation = :notify -end diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config/environments/test.rb b/vendor/built_in_modules/personal_conference/test/dummy/config/environments/test.rb deleted file mode 100644 index 6810c9147..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config/environments/test.rb +++ /dev/null @@ -1,39 +0,0 @@ -Dummy::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # The test environment is used exclusively to run your application's - # test suite. You never need to work with it otherwise. Remember that - # your test database is "scratch space" for the test suite and is wiped - # and recreated between test runs. Don't rely on the data there! - config.cache_classes = true - - # Configure static asset server for tests with Cache-Control for performance - config.serve_static_assets = true - config.static_cache_control = "public, max-age=3600" - - # Log error messages when you accidentally call methods on nil - config.whiny_nils = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - - # Raise exceptions instead of rendering exception templates - config.action_dispatch.show_exceptions = false - - # Disable request forgery protection in test environment - config.action_controller.allow_forgery_protection = false - - # Tell Action Mailer not to deliver emails to the real world. - # The :test delivery method accumulates sent emails in the - # ActionMailer::Base.deliveries array. - config.action_mailer.delivery_method = :test - - # Use SQL instead of Active Record's schema dumper when creating the test database. - # This is necessary if your schema can't be completely dumped by the schema dumper, - # like if you have constraints or database-specific column types - # config.active_record.schema_format = :sql - - # Print deprecation notices to the stderr - config.active_support.deprecation = :stderr -end diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/backtrace_silencers.rb b/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/backtrace_silencers.rb deleted file mode 100644 index 59385cdf3..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/backtrace_silencers.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. -# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } - -# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. -# Rails.backtrace_cleaner.remove_silencers! diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/inflections.rb b/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/inflections.rb deleted file mode 100644 index 9e8b0131f..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/inflections.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new inflection rules using the following format -# (all these examples are active by default): -# ActiveSupport::Inflector.inflections do |inflect| -# inflect.plural /^(ox)$/i, '\1en' -# inflect.singular /^(ox)en/i, '\1' -# inflect.irregular 'person', 'people' -# inflect.uncountable %w( fish sheep ) -# end diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/mime_types.rb b/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/mime_types.rb deleted file mode 100644 index 72aca7e44..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/mime_types.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new mime types for use in respond_to blocks: -# Mime::Type.register "text/richtext", :rtf -# Mime::Type.register_alias "text/html", :iphone diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/secret_token.rb b/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/secret_token.rb deleted file mode 100644 index 87c0a946c..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/secret_token.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Your secret key for verifying the integrity of signed cookies. -# If you change this key, all old signed cookies will become invalid! -# Make sure the secret is at least 30 characters and all random, -# no regular words or you'll be exposed to dictionary attacks. -Dummy::Application.config.secret_token = '08ae1abb617d588b6d3b9c5453dd61ec5560d0cba784ab4a4ac34a99f233c36b5bf7857b8a1bab5b5f5423cf87c9ac7bcc45c62290916c0e870a23a1c69ed273' diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/session_store.rb b/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/session_store.rb deleted file mode 100644 index 952473ff9..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/session_store.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Be sure to restart your server when you modify this file. - -Dummy::Application.config.session_store :cookie_store, key: '_dummy_session' - -# Use the database for sessions instead of the cookie-based default, -# which shouldn't be used to store highly confidential information -# (create the session table with "rails generate session_migration") -# Dummy::Application.config.session_store :active_record_store diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/wrap_parameters.rb b/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/wrap_parameters.rb deleted file mode 100644 index 999df2018..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config/initializers/wrap_parameters.rb +++ /dev/null @@ -1,14 +0,0 @@ -# Be sure to restart your server when you modify this file. -# -# This file contains settings for ActionController::ParamsWrapper which -# is enabled by default. - -# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. -ActiveSupport.on_load(:action_controller) do - wrap_parameters format: [:json] -end - -# Disable root element in JSON by default. -ActiveSupport.on_load(:active_record) do - self.include_root_in_json = false -end diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config/locales/en.yml b/vendor/built_in_modules/personal_conference/test/dummy/config/locales/en.yml deleted file mode 100644 index 179c14ca5..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config/locales/en.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Sample localization file for English. Add more files in this directory for other locales. -# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. - -en: - hello: "Hello world" diff --git a/vendor/built_in_modules/personal_conference/test/dummy/config/routes.rb b/vendor/built_in_modules/personal_conference/test/dummy/config/routes.rb deleted file mode 100644 index bb509f27a..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/config/routes.rb +++ /dev/null @@ -1,58 +0,0 @@ -Dummy::Application.routes.draw do - # The priority is based upon order of creation: - # first created -> highest priority. - - # Sample of regular route: - # match 'products/:id' => 'catalog#view' - # Keep in mind you can assign values other than :controller and :action - - # Sample of named route: - # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase - # This route can be invoked with purchase_url(:id => product.id) - - # Sample resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Sample resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Sample resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Sample resource route with more complex sub-resources - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', :on => :collection - # end - # end - - # Sample resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end - - # You can have the root of your site routed with "root" - # just remember to delete public/index.html. - # root :to => 'welcome#index' - - # See how all your routes lay out with "rake routes" - - # This is a legacy wild controller route that's not recommended for RESTful applications. - # Note: This route will make all actions in every controller accessible via GET requests. - # match ':controller(/:action(/:id(.:format)))' -end diff --git a/vendor/built_in_modules/personal_conference/test/dummy/lib/assets/.gitkeep b/vendor/built_in_modules/personal_conference/test/dummy/lib/assets/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/vendor/built_in_modules/personal_conference/test/dummy/log/.gitkeep b/vendor/built_in_modules/personal_conference/test/dummy/log/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/vendor/built_in_modules/personal_conference/test/dummy/public/404.html b/vendor/built_in_modules/personal_conference/test/dummy/public/404.html deleted file mode 100644 index 9a48320a5..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/public/404.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - The page you were looking for doesn't exist (404) - - - - - -
-

The page you were looking for doesn't exist.

-

You may have mistyped the address or the page may have moved.

-
- - diff --git a/vendor/built_in_modules/personal_conference/test/dummy/public/422.html b/vendor/built_in_modules/personal_conference/test/dummy/public/422.html deleted file mode 100644 index 83660ab18..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/public/422.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - The change you wanted was rejected (422) - - - - - -
-

The change you wanted was rejected.

-

Maybe you tried to change something you didn't have access to.

-
- - diff --git a/vendor/built_in_modules/personal_conference/test/dummy/public/500.html b/vendor/built_in_modules/personal_conference/test/dummy/public/500.html deleted file mode 100644 index b80307fc1..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/public/500.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - We're sorry, but something went wrong (500) - - - - - -
-

We're sorry, but something went wrong.

-

We've been notified about this issue and we'll take a look at it shortly.

-
- - diff --git a/vendor/built_in_modules/personal_conference/test/dummy/public/favicon.ico b/vendor/built_in_modules/personal_conference/test/dummy/public/favicon.ico deleted file mode 100644 index e69de29bb..000000000 diff --git a/vendor/built_in_modules/personal_conference/test/dummy/script/rails b/vendor/built_in_modules/personal_conference/test/dummy/script/rails deleted file mode 100644 index 81eab02f5..000000000 --- a/vendor/built_in_modules/personal_conference/test/dummy/script/rails +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env ruby.exe -# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application. - -APP_PATH = File.expand_path('../../config/application', __FILE__) -require File.expand_path('../../config/boot', __FILE__) -require 'rails/commands' diff --git a/vendor/built_in_modules/personal_conference/test/integration/navigation_test.rb b/vendor/built_in_modules/personal_conference/test/integration/navigation_test.rb deleted file mode 100644 index 97a94c9bb..000000000 --- a/vendor/built_in_modules/personal_conference/test/integration/navigation_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require 'test_helper' - -class NavigationTest < ActionDispatch::IntegrationTest - fixtures :all - - # test "the truth" do - # assert true - # end -end - diff --git a/vendor/built_in_modules/personal_conference/test/personal_conference_test.rb b/vendor/built_in_modules/personal_conference/test/personal_conference_test.rb deleted file mode 100644 index c3e0a3ba4..000000000 --- a/vendor/built_in_modules/personal_conference/test/personal_conference_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class PersonalConferenceTest < ActiveSupport::TestCase - test "truth" do - assert_kind_of Module, PersonalConference - end -end diff --git a/vendor/built_in_modules/personal_conference/test/test_helper.rb b/vendor/built_in_modules/personal_conference/test/test_helper.rb deleted file mode 100644 index dcd3b276e..000000000 --- a/vendor/built_in_modules/personal_conference/test/test_helper.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Configure Rails Environment -ENV["RAILS_ENV"] = "test" - -require File.expand_path("../dummy/config/environment.rb", __FILE__) -require "rails/test_help" - -Rails.backtrace_cleaner.remove_silencers! - -# Load support files -Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f } diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/co_author_relations_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/co_author_relations_controller.rb deleted file mode 100644 index 26b5acd9c..000000000 --- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/co_author_relations_controller.rb +++ /dev/null @@ -1,63 +0,0 @@ -class Panel::PersonalJournal::Desktop::CoAuthorRelationsController < ApplicationController - def index - @co_author_relations = CoAuthorRelation.all - new - - respond_to do |format| - format.html {render layout: false } - end - end - - def edit - @co_author_relation = CoAuthorRelation.find(params[:id]) - respond_to do |format| - format.html { render :layout => false} - end - end - - def new - @co_author_relation = CoAuthorRelation.new - end - - def create - @co_author_relation = CoAuthorRelation.new(params[:co_author_relation]) - @co_author_relations = CoAuthorRelation.all - - if @co_author_relation.save - newv = render_to_string partial: "show_form", object: @co_author_relations - render json: {success: true, msg: "New Relation successfully saved!", newvalue: newv}.to_json - else - error_msg = @co_author_relation.errors.full_messages.join("
") - render json: {success: false, msg: error_msg}.to_json - end - end - - def update - @co_author_relation = CoAuthorRelation.find(params[:id]) - if @co_author_relation.update_attributes(params[:co_author_relation]) - @co_author_relations = CoAuthorRelation.all - newv = render_to_string partial: "show_form", object: @co_author_relations - render json: {success: true, msg: "New Relation successfully updated!", newvalue: newv}.to_json - else - error_msg = @co_author.errors.full_messages.join("
") - render json: {success: false, msg: error_msg}.to_json - end - end - - def destroy - @co_author_relation = CoAuthorRelation.find(params[:id]) - @co_author_relation.destroy - reset_co_author_relation - - render :json => {success: true, msg: "deleted successfully!"} - end - - private - - def reset_co_author_relation - co_author = CoAuthor.where(co_author_relations_id: @co_author_relation.id) - co_author.map do |c| - c.update_attributes(co_author_relations_id: nil) - end - end -end diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/co_authors_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/co_authors_controller.rb deleted file mode 100644 index b9e1deaa5..000000000 --- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/co_authors_controller.rb +++ /dev/null @@ -1,59 +0,0 @@ -class Panel::PersonalJournal::Desktop::CoAuthorsController < ApplicationController - def index - nils, not_nils = CoAuthor.where(name_id: current_user.id)\ - .asc(:co_author).partition{|p| p.email.nil?} - @co_authors = not_nils + nils - @co_author_relations = CoAuthorRelation.all - - respond_to do |format| - format.html { render :layout => false} - end - end - - def new - @co_author = CoAuthor.new - @co_author_relations = CoAuthorRelation.all - - respond_to do |format| - format.html { render :layout => false} - end - end - - def edit - @co_author = CoAuthor.find(params[:id]) - @co_author_relations = CoAuthorRelation.all - respond_to do |format| - format.html { render :layout => false} - end - end - - def create - @co_author = CoAuthor.new(params[:co_author]) - @co_author.name_id= current_user.id - - if @co_author.save - render json: {success:true, msg: t('create.sucess.co_author')}.to_json - else - error_msg = @co_author.errors.full_messages.join("
") - render json: {success: false, msg: error_msg}.to_json - end - end - - def update - @co_author = CoAuthor.find(params[:id]) - - if @co_author.update_attributes(params[:co_author]) - render json: {success:true, msg: t('update.sucess.co_author')}.to_json - else - error_msg = @co_author.errors.full_messages.join("
") - render json: {success: false, msg: error_msg}.to_json - end - end - - def destroy - @co_author = CoAuthor.find(params[:id]) - @co_author.destroy - - render :json => {success: true, msg: "Co-author deleted successfully!"} - end -end diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_co_author_relations_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_co_author_relations_controller.rb new file mode 100644 index 000000000..735098d05 --- /dev/null +++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_co_author_relations_controller.rb @@ -0,0 +1,64 @@ +class Panel::PersonalJournal::Desktop::JournalCoAuthorRelationsController < ApplicationController + def index + @journal_co_author_relations = JournalCoAuthorRelation.all + new + + respond_to do |format| + format.html {render layout: false } + end + end + + def edit + @journal_co_author_relation = JournalCoAuthorRelation.find(params[:id]) + respond_to do |format| + format.html { render :layout => false} + end + end + + def new + @journal_co_author_relation = JournalCoAuthorRelation.new + end + + def create + @journal_co_author_relation = JournalCoAuthorRelation.new(params[:journal_co_author_relation]) + @journal_co_author_relations = JournalCoAuthorRelation.all + binding.pry + + if @journal_co_author_relation.save + newv = render_to_string partial: "show_form", object: @journal_co_author_relations + render json: {success: true, msg: "New Relation successfully saved!", newvalue: newv}.to_json + else + error_msg = @journal_co_author_relation.errors.full_messages.join("
") + render json: {success: false, msg: error_msg}.to_json + end + end + + def update + @journal_co_author_relation = JournalCoAuthorRelation.find(params[:id]) + if @journal_co_author_relation.update_attributes(params[:journal_co_author_relation]) + @journal_co_author_relations = JournalCoAuthorRelation.all + newv = render_to_string partial: "show_form", object: @journal_co_author_relations + render json: {success: true, msg: "New Relation successfully updated!", newvalue: newv}.to_json + else + error_msg = @journal_co_author.errors.full_messages.join("
") + render json: {success: false, msg: error_msg}.to_json + end + end + + def destroy + @journal_co_author_relation = JournalCoAuthorRelation.find(params[:id]) + @journal_co_author_relation.destroy + reset_co_author_relation + + render :json => {success: true, msg: "deleted successfully!"} + end + + private + + def reset_co_author_relation + co_author = JournalCoAuthor.where(co_author_relations_id: @co_author_relation.id) + co_author.map do |c| + c.update_attributes(co_author_relations_id: nil) + end + end +end diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_co_authors_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_co_authors_controller.rb new file mode 100644 index 000000000..6ddd86bda --- /dev/null +++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_co_authors_controller.rb @@ -0,0 +1,59 @@ +class Panel::PersonalJournal::Desktop::JournalCoAuthorsController < ApplicationController + def index + nils, not_nils = JournalCoAuthor.where(name_id: current_user.id)\ + .asc(:co_author).partition{|p| p.email.nil?} + @journal_co_authors = not_nils + nils + @journal_co_author_relations = JournalCoAuthorRelation.all + + respond_to do |format| + format.html { render :layout => false} + end + end + + def new + @journal_co_author = JournalCoAuthor.new + @journal_co_author_relations = JournalCoAuthorRelation.all + + respond_to do |format| + format.html { render :layout => false} + end + end + + def edit + @journal_co_author = JournalCoAuthor.find(params[:id]) + @journal_co_author_relations = JournalCoAuthorRelation.all + respond_to do |format| + format.html { render :layout => false} + end + end + + def create + @journal_co_author = JournalCoAuthor.new(params[:co_author]) + @journal_co_author.name_id= current_user.id + + if @journal_co_author.save + render json: {success:true, msg: t('create.sucess.co_author')}.to_json + else + error_msg = @journal_co_author.errors.full_messages.join("
") + render json: {success: false, msg: error_msg}.to_json + end + end + + def update + @journal_co_author = JournalCoAuthor.find(params[:id]) + + if @journal_co_author.update_attributes(params[:co_author]) + render json: {success:true, msg: t('update.sucess.co_author')}.to_json + else + error_msg = @journal_co_author.errors.full_messages.join("
") + render json: {success: false, msg: error_msg}.to_json + end + end + + def destroy + @journal_co_author = JournalCoAuthor.find(params[:id]) + @journal_co_author.destroy + + render :json => {success: true, msg: "Co-author deleted successfully!"} + end +end diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb index 9599ce9a1..83f9408de 100644 --- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb +++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb @@ -13,8 +13,8 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr @level_types = JournalLevelType.all @author_types = JournalAuthorType.all @paper_types= JournalPaperType.all - @co_author_candidate = - CoAuthor.where(name_id: current_user.id).map{|c|c.co_author} + @journal_co_author_candidate = + JournalCoAuthor.where(name_id: current_user.id).map{|c|c.co_author} @journal_candidate = WritingJournal.where(create_user_id: current_user.id).map{|j|j.journal_title}.uniq diff --git a/vendor/built_in_modules/personal_journal/app/models/co_author.rb b/vendor/built_in_modules/personal_journal/app/models/journal_co_author.rb similarity index 88% rename from vendor/built_in_modules/personal_journal/app/models/co_author.rb rename to vendor/built_in_modules/personal_journal/app/models/journal_co_author.rb index 4c662acb8..5d8617c7a 100644 --- a/vendor/built_in_modules/personal_journal/app/models/co_author.rb +++ b/vendor/built_in_modules/personal_journal/app/models/journal_co_author.rb @@ -1,4 +1,4 @@ -class CoAuthor +class JournalCoAuthor include Mongoid::Document LANGUAGE_TYPES = [ "English", "Chinese" ] @@ -7,7 +7,7 @@ class CoAuthor field :co_author, localize: true field :email - belongs_to :co_author_relations + belongs_to :journal_co_author_relations VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/ validates :email, format: { with: VALID_EMAIL_REGEX }, diff --git a/vendor/built_in_modules/personal_journal/app/models/co_author_relation.rb b/vendor/built_in_modules/personal_journal/app/models/journal_co_author_relation.rb similarity index 71% rename from vendor/built_in_modules/personal_journal/app/models/co_author_relation.rb rename to vendor/built_in_modules/personal_journal/app/models/journal_co_author_relation.rb index f0d5f17c3..2218605b6 100644 --- a/vendor/built_in_modules/personal_journal/app/models/co_author_relation.rb +++ b/vendor/built_in_modules/personal_journal/app/models/journal_co_author_relation.rb @@ -1,10 +1,10 @@ -class CoAuthorRelation +class JournalCoAuthorRelation include Mongoid::Document include Mongoid::Timestamps field :relation, localize: true - has_and_belongs_to_many :co_authors + has_and_belongs_to_many :journal_co_authors validates :relation, presence: true, uniqueness: { case_sensitive: false } diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_form.html.erb deleted file mode 100644 index ed0aa3180..000000000 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_form.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -<%= f.fields_for :co_author_relation_translations do |f| %> - <%= f.text_field locale, - value: (@co_author_relation.co_author_relation_translations[locale] rescue nil) %> -<% end %> -<%= f.submit "Save", class: "ini_input hp hh2 thmtxt thmc2", style: "margin-left: 10px;" %> -<% if not @co_author_relation.new_record? %> - <%= submit_tag "Cancel", :type => "button", class: "bt-cancel-type ini_input hp hh2 thmtxt" %> -<% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_new.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_new.html.erb deleted file mode 100644 index 68bf9ed63..000000000 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_new.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%= form_for(@co_author_relation, url: panel_personal_journal_desktop_co_author_relations_path, html:{"form-type"=>"ajax_form", "callback-method"=>"coauthorRelationForm"} ) do |f| %> - <%= render partial: 'panel/personal_journal/desktop/co_author_relations/form' , locals: {:f => f}%> -<% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_show_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_show_form.html.erb deleted file mode 100644 index 246f0413b..000000000 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_show_form.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -<% @co_author_relations.each_with_index do |co_author_relation,i| %> - <% if ( i % 6 ) == 0 %> -
- -
- <% end %> -<% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/edit.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/edit.html.erb deleted file mode 100644 index 66fc1dff3..000000000 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/edit.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%= form_for(@co_author_relation, url: panel_personal_journal_desktop_co_author_relation_path(@co_author_relation), html:{"form-type"=>"ajax_form", "callback-method"=>"coauthorRelationEditForm"} ) do |f| %> - <%= render partial: 'panel/personal_journal/desktop/co_author_relations/form' , locals: {:f => f}%> -<% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/edit.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/edit.html.erb deleted file mode 100644 index a8250528d..000000000 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/edit.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%= form_for @co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: panel_personal_journal_desktop_co_author_path(@co_author) do |f| %> - <%= render partial: 'panel/personal_journal/desktop/co_authors/form', locals: {:f => f} %> -<% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/new.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/new.html.erb deleted file mode 100644 index ed12b132c..000000000 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/new.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%= form_for @co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: panel_personal_journal_desktop_co_authors_path do |f| %> - <%= render partial: 'panel/personal_journal/desktop/co_authors/form', locals: {:f => f} %> -<% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb new file mode 100644 index 000000000..c6f9ef531 --- /dev/null +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb @@ -0,0 +1,11 @@ +<%= f.text_field :journal_co_author_relation %> + +<%= f.submit "Save", class: "ini_input hp hh2 thmtxt thmc2", style: "margin-left: 10px;" %> +<% if not @journal_co_author_relation.new_record? %> + <%= submit_tag "Cancel", :type => "button", class: "bt-cancel-type ini_input hp hh2 thmtxt" %> +<% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_new.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_new.html.erb new file mode 100644 index 000000000..803dbc0a1 --- /dev/null +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_new.html.erb @@ -0,0 +1,3 @@ +<%= form_for(@journal_co_author_relation, url: panel_personal_journal_desktop_journal_co_author_relations_path, html:{"form-type"=>"ajax_form", "callback-method"=>"coauthorRelationForm"} ) do |f| %> + <%= render partial: 'panel/personal_journal/desktop/journal_co_author_relations/form' , locals: {:f => f}%> +<% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb new file mode 100644 index 000000000..2ef640c4e --- /dev/null +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb @@ -0,0 +1,17 @@ +<% @journal_co_author_relations.each_with_index do |journal_co_author_relation,i| %> + <% if ( i % 6 ) == 0 %> +
+ +
+ <% end %> +<% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/edit.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/edit.html.erb new file mode 100644 index 000000000..b491c865c --- /dev/null +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/edit.html.erb @@ -0,0 +1,3 @@ +<%= form_for(@journal_co_author_relation, url: panel_personal_journal_desktop_journal_co_author_relation_path(@co_author_relation), html:{"form-type"=>"ajax_form", "callback-method"=>"coauthorRelationEditForm"} ) do |f| %> + <%= render partial: 'panel/personal_journal/desktop/journal_co_author_relations/form' , locals: {:f => f}%> +<% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb similarity index 100% rename from vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/index.html.erb rename to vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/_form.html.erb similarity index 70% rename from vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/_form.html.erb rename to vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/_form.html.erb index 0c2d0f1a6..918ff4ef9 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/_form.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/_form.html.erb @@ -8,11 +8,14 @@