Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
V
VenJob
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Mai Hoang Thai Ha
  • VenJob
  • Merge Requests
  • !15

Merged
Opened Aug 25, 2021 by Mai Hoang Thai Ha@hamht 
  • Report abuse
Report abuse

Feature favorite and history

From Task/15_favorite_job_ID8_history_ID9 into master

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b Task/15_favorite_job_ID8_history_ID9 origin/Task/15_favorite_job_ID8_history_ID9

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff Task/15_favorite_job_ID8_history_ID9

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 8
  • Commits 20
  • Changes 62
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Mai Hoang Thai Ha @hamht

    added 1 commit

    • cbcd57ee - fixed button

    Compare with previous version

    Aug 30, 2021

    added 1 commit

    • cbcd57ee - fixed button

    Compare with previous version

    added 1 commit * cbcd57ee - fixed button [Compare with previous version](https://gitlab.zigexn.vn/hamht/VenJob/merge_requests/15/diffs?diff_id=5447&start_sha=6ce36e028f8107a69e00518a954d2c23342b648b)
    Toggle commit list
  • Mai Hoang Thai Ha @hamht

    added 1 commit

    • 00290967 - fixed buttom

    Compare with previous version

    Aug 31, 2021

    added 1 commit

    • 00290967 - fixed buttom

    Compare with previous version

    added 1 commit * 00290967 - fixed buttom [Compare with previous version](https://gitlab.zigexn.vn/hamht/VenJob/merge_requests/15/diffs?diff_id=5448&start_sha=cbcd57eedf8d65f1ca768c36bfbe8626fbaff394)
    Toggle commit list
  • Mai Hoang Thai Ha @hamht

    added 1 commit

    • 570fcd3b - fixed n+1 queries in Jobs index

    Compare with previous version

    Aug 31, 2021

    added 1 commit

    • 570fcd3b - fixed n+1 queries in Jobs index

    Compare with previous version

    added 1 commit * 570fcd3b - fixed n+1 queries in Jobs index [Compare with previous version](https://gitlab.zigexn.vn/hamht/VenJob/merge_requests/15/diffs?diff_id=5449&start_sha=0029096700a7604a69840cb261648921643139c1)
    Toggle commit list
  • phuctmZigexn @phuctm

    changed target branch from master to Task/13_ID15_ID14_ID16

    Sep 01, 2021

    changed target branch from master to Task/13_ID15_ID14_ID16

    changed target branch from `master` to `Task/13_ID15_ID14_ID16`
    Toggle commit list
  • phuctmZigexn @phuctm

    changed target branch from Task/13_ID15_ID14_ID16 to master

    Sep 01, 2021

    changed target branch from Task/13_ID15_ID14_ID16 to master

    changed target branch from `Task/13_ID15_ID14_ID16` to `master`
    Toggle commit list
  • Mai Hoang Thai Ha @hamht

    added 4 commits

    • cd87d7ce - remove devise invitable
    • a59c56fc - fixed devise messages style
    • 0f84c9fd - add index for favorite and history
    • a58bf498 - add page register/2

    Compare with previous version

    Sep 01, 2021

    added 4 commits

    • cd87d7ce - remove devise invitable
    • a59c56fc - fixed devise messages style
    • 0f84c9fd - add index for favorite and history
    • a58bf498 - add page register/2

    Compare with previous version

    added 4 commits * cd87d7ce - remove devise invitable * a59c56fc - fixed devise messages style * 0f84c9fd - add index for favorite and history * a58bf498 - add page register/2 [Compare with previous version](https://gitlab.zigexn.vn/hamht/VenJob/merge_requests/15/diffs?diff_id=5454&start_sha=570fcd3b1d128d1b56d08099c31f936544df7ed4)
    Toggle commit list
  • Mai Hoang Thai Ha @hamht

    added 1 commit

    • 1b95b560 - remove email field

    Compare with previous version

    Sep 01, 2021

    added 1 commit

    • 1b95b560 - remove email field

    Compare with previous version

    added 1 commit * 1b95b560 - remove email field [Compare with previous version](https://gitlab.zigexn.vn/hamht/VenJob/merge_requests/15/diffs?diff_id=5455&start_sha=a58bf498dfd87d02d4a2cf73c936384fbbcc62dc)
    Toggle commit list
  • phuctmZigexn
    @phuctm started a discussion on the diff Sep 06, 2021
    Resolved by Mai Hoang Thai Ha Sep 07, 2021
    db/migrate/20210824082155_add_index_to_favorite_jobs.rb 0 → 100644
    1 class AddIndexToFavoriteJobs < ActiveRecord::Migration[6.1]
    2 def change
    3 add_index :favorite_jobs, %i[job_id job_id], unique: true
    • phuctmZigexn @phuctm commented Sep 06, 2021
      Master

      %i[job_id job_id] sao lại 2 cái job_id

      `%i[job_id job_id]` sao lại 2 cái job_id
    • phuctmZigexn @phuctm commented Sep 06, 2021
      Master

      nhưng mà tại sao lại phải đánh index cặp ID này

      nhưng mà tại sao lại phải đánh index cặp ID này
    • Mai Hoang Thai Ha @hamht commented Sep 07, 2021
      Master

      em để job_id với user_id mà chắc do type nhầm

      Edited Sep 07, 2021 by Mai Hoang Thai Ha
      em để `job_id` với `user_id` mà chắc do type nhầm
    Please register or sign in to reply
  • phuctmZigexn
    @phuctm started a discussion on an old version of the diff Sep 06, 2021
    Resolved by Mai Hoang Thai Ha Sep 07, 2021
    app/assets/stylesheets/favorite_jobs.scss 0 → 100644
    1 // Place all the styles related to the FavoriteJobs controller here.
    • phuctmZigexn @phuctm commented Sep 06, 2021
      Master

      ko dùng thì xóa đi nha em

      ko dùng thì xóa đi nha em
    • Mai Hoang Thai Ha @hamht

      changed this line in version 9 of the diff

      Sep 07, 2021

      changed this line in version 9 of the diff

      changed this line in [version 9 of the diff](https://gitlab.zigexn.vn/hamht/VenJob/merge_requests/15/diffs?diff_id=5457&start_sha=1b95b560a41abd16c6e5b69370b89ecba363d4e8#b243c928536a1934cc7e7b78583cb2aaffb00e36_1_0)
      Toggle commit list
    Please register or sign in to reply
  • phuctmZigexn
    @phuctm started a discussion on an old version of the diff Sep 06, 2021
    Resolved by Mai Hoang Thai Ha Sep 07, 2021
    app/assets/stylesheets/history_jobs.scss 0 → 100644
    1 // Place all the styles related to the HistoryJobs controller here.
    • phuctmZigexn @phuctm commented Sep 06, 2021
      Master

      ko dùng thì xóa đi nha em

      ko dùng thì xóa đi nha em
    • Mai Hoang Thai Ha @hamht

      changed this line in version 9 of the diff

      Sep 07, 2021

      changed this line in version 9 of the diff

      changed this line in [version 9 of the diff](https://gitlab.zigexn.vn/hamht/VenJob/merge_requests/15/diffs?diff_id=5457&start_sha=1b95b560a41abd16c6e5b69370b89ecba363d4e8#2af229c33d169820ec5a99476153c8e16aae1139_1_0)
      Toggle commit list
    Please register or sign in to reply
  • phuctmZigexn
    @phuctm started a discussion on an old version of the diff Sep 06, 2021
    Resolved by Mai Hoang Thai Ha Sep 07, 2021
    app/controllers/applies_controller.rb
    1 1 class AppliesController < ApplicationController
    2 before_action :logged_in_user
    • phuctmZigexn @phuctm commented Sep 06, 2021
      Master

      devise có sẵn helper này rồi nha before_action :authenticate_user! ko cần phải dùng logged_in_user đâu

      Edited Sep 06, 2021 by phuctmZigexn
      devise có sẵn helper này rồi nha `before_action :authenticate_user!` ko cần phải dùng `logged_in_user` đâu
    • Mai Hoang Thai Ha @hamht

      changed this line in version 9 of the diff

      Sep 07, 2021

      changed this line in version 9 of the diff

      changed this line in [version 9 of the diff](https://gitlab.zigexn.vn/hamht/VenJob/merge_requests/15/diffs?diff_id=5457&start_sha=1b95b560a41abd16c6e5b69370b89ecba363d4e8#d9c45092651a193b7c63a6a3b87ae6db5b912ec9_2_2)
      Toggle commit list
    Please register or sign in to reply
  • phuctmZigexn
    @phuctm started a discussion on an old version of the diff Sep 06, 2021
    Resolved by Mai Hoang Thai Ha Sep 07, 2021
    app/controllers/history_jobs_controller.rb 0 → 100644
    1 class HistoryJobsController < ApplicationController
    2 before_action :logged_in_user
    3
    4 def index
    5 # job_id_list = current_user.history_jobs.map(&:job_id)
    • phuctmZigexn @phuctm commented Sep 06, 2021
      Master
      # job_id_list = current_user.history_jobs.map(&:job_id)
      # @jobs = Job.includes(:cities, :cities_jobs, :company).references(:cities).find(job_id_list)

      code comment thì xóa đi nha em

      ```ruby # job_id_list = current_user.history_jobs.map(&:job_id) # @jobs = Job.includes(:cities, :cities_jobs, :company).references(:cities).find(job_id_list) ``` code comment thì xóa đi nha em
    • Mai Hoang Thai Ha @hamht

      changed this line in version 9 of the diff

      Sep 07, 2021

      changed this line in version 9 of the diff

      changed this line in [version 9 of the diff](https://gitlab.zigexn.vn/hamht/VenJob/merge_requests/15/diffs?diff_id=5457&start_sha=1b95b560a41abd16c6e5b69370b89ecba363d4e8#91186b9cf439b81abbb56acbeafa2f9d95907ffd_5_5)
      Toggle commit list
    Please register or sign in to reply
  • phuctmZigexn
    @phuctm started a discussion on the diff Sep 06, 2021
    Resolved by Mai Hoang Thai Ha Sep 07, 2021
    app/controllers/applies_controller.rb
    54 55 params.require(:apply_job).permit(:user_name, :email, :cv, :job_id)
    55 56 end
    56 57
    • phuctmZigexn @phuctm commented Sep 06, 2021
      Master

      NOTE 1

      def confirm
          @apply = current_user.apply_jobs.build(apply_params)
          @apply.job = @job

      chỗ này em ko cần phải có dòng @apply.job = @job. Vì em đã có before_action :load_job nên đảm bảo là job đã đúng. Còn job_id thì đã có sẵn trong apply_params

      => tương tự với action create nha

      Edited Sep 06, 2021 by phuctmZigexn
      # NOTE 1 ```ruby def confirm @apply = current_user.apply_jobs.build(apply_params) @apply.job = @job ``` chỗ này em ko cần phải có dòng `@apply.job = @job`. Vì em đã có `before_action :load_job` nên đảm bảo là job đã đúng. Còn `job_id` thì đã có sẵn trong `apply_params` => tương tự với action **create** nha
    Please register or sign in to reply
  • Mai Hoang Thai Ha @hamht

    resolved all discussions

    Sep 07, 2021

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Mai Hoang Thai Ha @hamht

    added 1 commit

    • bcc62012 - fixed review, add apply job in favorite/history index, add partials jobs_list_index

    Compare with previous version

    Sep 07, 2021

    added 1 commit

    • bcc62012 - fixed review, add apply job in favorite/history index, add partials jobs_list_index

    Compare with previous version

    added 1 commit * bcc62012 - fixed review, add apply job in favorite&#x2F;history index, add partials jobs_list_index [Compare with previous version](https://gitlab.zigexn.vn/hamht/VenJob/merge_requests/15/diffs?diff_id=5457&start_sha=1b95b560a41abd16c6e5b69370b89ecba363d4e8)
    Toggle commit list
  • Mai Hoang Thai Ha @hamht

    added 1 commit

    • 3a2d621e - fix code style

    Compare with previous version

    Sep 14, 2021

    added 1 commit

    • 3a2d621e - fix code style

    Compare with previous version

    added 1 commit * 3a2d621e - fix code style [Compare with previous version](https://gitlab.zigexn.vn/hamht/VenJob/merge_requests/15/diffs?diff_id=5474&start_sha=bcc6201201bd64fa7c3077b832fb7907b80e4bc9)
    Toggle commit list
  • phuctmZigexn @phuctm

    mentioned in commit 424b9d2b

    Sep 23, 2021

    mentioned in commit 424b9d2b

    mentioned in commit 424b9d2b7d60b5bdda96250272642366a5c2e4ee
    Toggle commit list
  • phuctmZigexn @phuctm

    merged

    Sep 23, 2021

    merged

    merged
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: hamht/VenJob!15
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.