Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfixes based on functional tests #3338

Merged
merged 23 commits into from
Feb 23, 2017
Merged

Bugfixes based on functional tests #3338

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
dd2e7c9
Merge remote-tracking branch 'snipe/develop' into develop
vjandrea Feb 9, 2017
3358e7d
Toggles the disabled state of auto_increment_prefix
vjandrea Feb 10, 2017
f7555ac
Delete asset image: made checkbox more visible
vjandrea Feb 11, 2017
2e2f6c0
Merged branch feature/3153 into develop
vjandrea Feb 11, 2017
aa90ad2
Merged branch feature/1390 into develop
vjandrea Feb 11, 2017
99f7d33
Merged branch develop into develop
vjandrea Feb 16, 2017
6cc536c
Merged branch develop into develop
vjandrea Feb 17, 2017
c835c7e
Merged branch develop into develop
vjandrea Feb 19, 2017
8b74e32
Added personal-access-token component
vjandrea Feb 20, 2017
2447fc7
Created basic API testing configuration
vjandrea Feb 20, 2017
d5f0215
First version of /components endpoind cest
vjandrea Feb 20, 2017
27537d6
On-the-fly bearer token generation
vjandrea Feb 20, 2017
eb4a6f1
Completed testing of PATCH and PUT methods
vjandrea Feb 20, 2017
1aea9ac
Added /components/{id}/assets route with tests
vjandrea Feb 20, 2017
d6ed677
Updated route and dataTable in view
vjandrea Feb 20, 2017
77f0de8
Completed test assertion
vjandrea Feb 20, 2017
71b2889
Added links to assets in ComponentsAssets view
vjandrea Feb 20, 2017
37d0db0
Linked Company in AssetView page
vjandrea Feb 20, 2017
6eb5624
Bugfixes based on functional tests
vjandrea Feb 20, 2017
375ac50
Removed unused function
vjandrea Feb 21, 2017
302f775
Merged branch develop into feature/functionaltests
vjandrea Feb 22, 2017
4f97605
Marked tests as incomplete
vjandrea Feb 22, 2017
6ee5004
Added check for existence in groups/edit.blade.php
vjandrea Feb 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Added check for existence in groups/edit.blade.php
  • Loading branch information
@vjandrea
vjandrea committed Feb 22, 2017
commit 6ee5004062c5a3793fcdbd37703c7e99a5b89f54
2 changes: 1 addition & 1 deletion resources/views/groups/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
'helpTitle' => trans('admin/groups/general.about_groups_title'),
'helpText' => trans('admin/groups/general.about_groups_text'),
'item' => $group,
'formAction' => ($group->id) ? route('groups.update', ['accessory' => $group->id]) : route('groups.store'),
'formAction' => ($group !== null && $group->id !== null) ? route('groups.update', ['accessory' => $group->id]) : route('groups.store'),

])
@section('content')
Expand Down