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
  • !6

Merged
Opened Aug 04, 2021 by Nguyen Hoang Mai Phuong@phuongnhm 
  • Report abuse
Report abuse

page ID20

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b job-detail origin/job-detail

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 job-detail

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 5
  • Commits 3
  • Pipelines 3
  • Changes 12
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 05, 2021
    Resolved by Nguyen Hoang Mai Phuong Aug 05, 2021
    app/assets/stylesheets/custom.scss
    58 58 }
    59 59 }
    60 60
    61 .apply-job btn{
    • Thanh Hung Pham @hungpt commented Aug 05, 2021
      Master

      @phuongnhm Add space before {

      @phuongnhm Add space before `{`
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 2 of the diff

      Aug 05, 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/6/diffs?diff_id=5387&start_sha=30c1a60e235e1572906c555de677779979cddcc6#79a66919b2dd7890dc5d183a3a7a2dd60f7447b3_61_61)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 05, 2021
    Resolved by Nguyen Hoang Mai Phuong Aug 05, 2021
    app/controllers/jobs_controller.rb
    12 12 @total = jobs.count
    13 13 @jobs = jobs.latest_jobs.page(params[:page])
    14 14 end
    15
    16 def show
    17 @job = Job.latest_jobs.find_by(id: params[:job_id])
    • Thanh Hung Pham @hungpt commented Aug 05, 2021
      Master

      @phuongnhm Em dùng slug tương tự City, Industry nha. Để mình ẩn đi job id trên url nha em.

      • /detail/228 => như vậy người dùng sẽ biết ID thay đổi bằng cách nhập vào url.
      @phuongnhm Em dùng `slug` tương tự City, Industry nha. Để mình ẩn đi `job id` trên url nha em. - `/detail/228` => như vậy người dùng sẽ biết ID thay đổi bằng cách nhập vào url.
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 2 of the diff

      Aug 05, 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/6/diffs?diff_id=5387&start_sha=30c1a60e235e1572906c555de677779979cddcc6#6fa69a07843a58f190bf4d7e0692b9cc5b0bf52b_17_17)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 05, 2021
    Last updated by Nguyen Hoang Mai Phuong Aug 05, 2021
    app/views/jobs/show.html.slim
    16 | Location:
    17 - @job.cities.each do |city|
    18 = link_to city.name, city_slug_path(city.slug)
    19 p.mb-2
    20 | Job type:
    21 = @job.job_type
    22 .col
    23 p.mb-2
    24 | Level:
    25 = @job.level
    26 p.mb-2
    27 | Experience:
    28 = @job.experience
    29 p.mb-2
    30 | Expired at:
    31 = @job.expired_at.strftime("%d/%m/%Y")
    • Thanh Hung Pham @hungpt commented Aug 05, 2021
      Master

      @phuongnhm Em viết một method trong helper để format dữ liệu để hiển thị ra view nha.

      @phuongnhm Em viết một method trong `helper` để format dữ liệu để hiển thị ra view nha.
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 2 of the diff

      Aug 05, 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/6/diffs?diff_id=5387&start_sha=30c1a60e235e1572906c555de677779979cddcc6#4f6f8650adc8fcba290a4f6bdab798db3c6df37e_31_31)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • cb86cd1d - change find id to slug

    Compare with previous version

    Aug 05, 2021

    added 1 commit

    • cb86cd1d - change find id to slug

    Compare with previous version

    added 1 commit * cb86cd1d - change find id to slug [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/6/diffs?diff_id=5387&start_sha=30c1a60e235e1572906c555de677779979cddcc6)
    Toggle commit list
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Aug 05, 2021
    Resolved by Thanh Hung Pham Aug 05, 2021
    app/helpers/application_helper.rb
    1 1 module ApplicationHelper
    2 def format_datetime(input)
    3 input.strftime('%d/%m/%Y')
    • Thanh Hung Pham @hungpt commented Aug 05, 2021
      Master

      @phuongnhm Nên kiểm tra param đầu vào nha em

      def format_datetime(input)
        return if input.nil?
      
       input.strftime('%d/%m/%Y')
      end
      Edited Aug 05, 2021
      @phuongnhm Nên kiểm tra param đầu vào nha em ``` def format_datetime(input) return if input.nil? input.strftime('%d/%m/%Y') end ```
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 05, 2021
    Last updated by Nguyen Hoang Mai Phuong Aug 05, 2021
    app/views/jobs/_breadcrumb.html.slim 0 → 100644
    1 nav.breadcrumb[style="--bs-breadcrumb-divider: '>';" aria-label="breadcrumb"]
    2 ol.breadcrumb.py-3
    3 li.breadcrumb-item
    4 = link_to "Top", root_path
    5 li.breadcrumb-item
    6 - @job.cities.each do |city|
    7 = link_to city.name, city_slug_path(city.slug)
    8 li.breadcrumb-item
    9 - @job.industries.each do |industry|
    10 = link_to industry.name, industry_slug_path(industry.slug)
    11 li.breadcrumb-item.active = link_to @job.title
    • Thanh Hung Pham @hungpt commented Aug 05, 2021
      Master

      @phuongnhm Chỗ này đâu cần link đâu em? hiện text được rồi. Mình đang ở job đó mà

      @phuongnhm Chỗ này đâu cần link đâu em? hiện text được rồi. Mình đang ở job đó mà
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 3 of the diff

      Aug 05, 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/6/diffs?diff_id=5388&start_sha=cb86cd1db99523ae1a32f55aa410494e8bcb2036#aedccc9d5e0465a4d2e5a4d3e7bd809bcec1c7ed_11_10)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • acaf9342 - fix display location

    Compare with previous version

    Aug 05, 2021

    added 1 commit

    • acaf9342 - fix display location

    Compare with previous version

    added 1 commit * acaf9342 - fix display location [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/6/diffs?diff_id=5388&start_sha=cb86cd1db99523ae1a32f55aa410494e8bcb2036)
    Toggle commit list
  • Thanh Hung Pham @hungpt

    mentioned in commit b3617479

    Aug 05, 2021

    mentioned in commit b3617479

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

    merged

    Aug 05, 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!6
×

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.