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
  • Nguyen Hoang Mai Phuong
  • VeNJOB
  • Merge Requests
  • !13

Merged
Opened Nov 01, 2021 by Nguyen Hoang Mai Phuong@phuongnhm 
  • Report abuse
Report abuse

Admin

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b Admin origin/Admin

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 Admin

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 4
  • Commits 5
  • Pipelines 5
  • Changes 17
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Nov 01, 2021
    Last updated by Nguyen Hoang Mai Phuong Nov 02, 2021
    app/controllers/admins_controller.rb 0 → 100644
    1 class AdminsController < ApplicationController
    2 before_action :authenticate_admin!
    3
    4 def index
    5 session[:apply_job_id] = nil
    6 hash_condition = { email: params[:email],
    7 cities: { id: params[:city_id] },
    8 industries: { id: params[:industry_id] } }
    9 remove_blank_value = deep_compact(hash_condition)
    10 @applied_jobs = applied_jobs_query.query_date(apply_params).where(remove_blank_value).page(params[:page])
    11 session[:apply_job_id] = @applied_jobs.map(&:id)
    12 end
    13
    14 def export
    15 apply_job = ApplyJob.find(session[:apply_job_id])
    • Thanh Hung Pham @hungpt commented Nov 01, 2021
      Master

      @phuongnhm Nên kiểm tra session[:apply_job_id] có bị nil hay không, trước khi sử dụng nha em.

      @phuongnhm Nên kiểm tra `session[:apply_job_id]` có bị nil hay không, trước khi sử dụng nha em.
    • Thanh Hung Pham @hungpt commented Nov 02, 2021
      Master

      @phuongnhm

      • Chỗ này chưa fix nè.
      • Test lại chưa vậy em? ApplyJob.find(session[:apply_job_id]) sửa key rồi sao chỗ này chưa sửa?
      @phuongnhm - Chỗ này chưa fix nè. - Test lại chưa vậy em? `ApplyJob.find(session[:apply_job_id])` sửa key rồi sao chỗ này chưa sửa?
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 3 of the diff

      Nov 02, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/13/diffs?diff_id=5537&start_sha=f831c99472b2635901e83c5f1dd4992489814782#27a60a0b6c493713edf55324ed371fe69f210c3c_15_15)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Nov 01, 2021
    Last updated by Nguyen Hoang Mai Phuong Nov 02, 2021
    app/controllers/admins_controller.rb 0 → 100644
    1 class AdminsController < ApplicationController
    2 before_action :authenticate_admin!
    3
    4 def index
    5 session[:apply_job_id] = nil
    6 hash_condition = { email: params[:email],
    7 cities: { id: params[:city_id] },
    8 industries: { id: params[:industry_id] } }
    9 remove_blank_value = deep_compact(hash_condition)
    10 @applied_jobs = applied_jobs_query.query_date(apply_params).where(remove_blank_value).page(params[:page])
    11 session[:apply_job_id] = @applied_jobs.map(&:id)
    • Thanh Hung Pham @hungpt commented Nov 01, 2021
      Master

      @phuongnhm cái này là số nhiều mà? session[:apply_job_id] => session[:apply_job_ids]

      @phuongnhm cái này là số nhiều mà? `session[:apply_job_id]` => `session[:apply_job_ids]`
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 2 of the diff

      Nov 02, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/13/diffs?diff_id=5536&start_sha=30d04585f75500853e7d01cb5f44560076ba9e09#27a60a0b6c493713edf55324ed371fe69f210c3c_11_11)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Nov 01, 2021
    Last updated by Nguyen Hoang Mai Phuong Nov 02, 2021
    app/controllers/admins_controller.rb 0 → 100644
    1 class AdminsController < ApplicationController
    2 before_action :authenticate_admin!
    3
    4 def index
    5 session[:apply_job_id] = nil
    • Thanh Hung Pham @hungpt commented Nov 01, 2021
      Master

      @phuongnhm chỗ này mình có thể dùng session.delete(:apply_job_id)

      @phuongnhm chỗ này mình có thể dùng `session.delete(:apply_job_id)`
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 2 of the diff

      Nov 02, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/13/diffs?diff_id=5536&start_sha=30d04585f75500853e7d01cb5f44560076ba9e09#27a60a0b6c493713edf55324ed371fe69f210c3c_5_5)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • f831c994 - fix controller session

    Compare with previous version

    Nov 02, 2021

    added 1 commit

    • f831c994 - fix controller session

    Compare with previous version

    added 1 commit * f831c994 - fix controller session [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/13/diffs?diff_id=5536&start_sha=30d04585f75500853e7d01cb5f44560076ba9e09)
    Toggle commit list
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • 02c933d8 - fix controller export method

    Compare with previous version

    Nov 02, 2021

    added 1 commit

    • 02c933d8 - fix controller export method

    Compare with previous version

    added 1 commit * 02c933d8 - fix controller export method [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/13/diffs?diff_id=5537&start_sha=f831c99472b2635901e83c5f1dd4992489814782)
    Toggle commit list
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • 7baa7a73 - fix query date condition

    Compare with previous version

    Nov 02, 2021

    added 1 commit

    • 7baa7a73 - fix query date condition

    Compare with previous version

    added 1 commit * 7baa7a73 - fix query date condition [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/13/diffs?diff_id=5538&start_sha=02c933d864b0fb0a8cf2d4bc9dc03fe514a0d031)
    Toggle commit list
  • Thanh Hung Pham @hungpt

    mentioned in commit b152d655

    Nov 02, 2021

    mentioned in commit b152d655

    mentioned in commit b152d6558678e8682eac8d19e9e427b305b40bcd
    Toggle commit list
  • Thanh Hung Pham @hungpt

    merged

    Nov 02, 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: phuongnhm/VeNJOB!13
×

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.