Skip to content

Commit

Permalink
Merge pull request #399 from FrozenNode/dev
Browse files Browse the repository at this point in the history
Merge 4.8.0 into master
  • Loading branch information
janhartigan committed Nov 24, 2013
2 parents 5e74c29 + 4ccb479 commit 7d17e35
Show file tree
Hide file tree
Showing 26 changed files with 1,113 additions and 672 deletions.
11 changes: 11 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
## Changelog

### 4.8.0
- Anonymous functions can now be passed for custom action title, confirmation, and messages options
- It is now possible to return a redirect from custom actions
- Selecting an item now scrolls the browser to the top of the page
- It is now possible to return accessor values into the edit form
- Default values can now be set for edit fields
- Bugfix: Custom dashboards no longer include unnecessary js files
- Bugfix: Updated to latest jQuery timepicker addon to fix some legacy jQuery UI bugs
- Bugfix: The detach() method is now used to remove related items instead of delete()
- Bugfix: The bool filter field wasn't properly grabbing results

### 4.7.2
- Bugfix: New Laravel setRules method in validator was throwing Administrator's setRules typehinting off
- Bugfix: Redirection was always pointing at the admin dashboard instead of the current page
Expand Down
8 changes: 6 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "frozennode/administrator",
"description": "A database interface package for Laravel",
"homepage": "http://administrator.frozennode.com",
"keywords": ["administrator", "admin", "database", "laravel-administrator", "laravel", "cms"],
"license": "MIT",
"authors": [
Expand All @@ -9,11 +10,14 @@
"email": "[email protected]"
}
],
"support": {
"issues": "https://github.com/FrozenNode/Laravel-Administrator/issues"
},
"require": {
"php": ">=5.3.0"
"php": ">=5.3.0",
"laravel/framework": ">=4.0.0"
},
"require-dev": {
"laravel/framework": ">=4.0.0",
"mockery/mockery": "0.8.0"
},
"autoload": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public function up()
$table->decimal('salary', 10, 2);
$table->timestamps();
});

}

/**
Expand Down
1 change: 0 additions & 1 deletion public/css/elements.less
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
padding:4px 7px;
border:1px solid #cccccc;
font-size: 13px;
.semiBold;
.borderRadius(1px);
.transition;
width: 210px;
Expand Down
2 changes: 1 addition & 1 deletion public/css/media_queries.less
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,6 @@
}
}
}
@media @desktop-xl {
@media @desktopXl {

}
11 changes: 9 additions & 2 deletions public/js/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,9 @@
//update all the info to the new item state
ko.mapping.updateData(self, self.model, self.model);

//scroll to the top of the page
$('html, body').animate({scrollTop: 0}, 'fast')

//if this is a new item (id is falsy), just overwrite the viewModel with the original data model
if (!id)
{
Expand Down Expand Up @@ -453,7 +456,7 @@
adminData.edit_fields = data.administrator_edit_fields;
self.editFields(window.admin.prepareEditFields());

//update the action permissions
//update the actions and the action permissions
self.actions(data.administrator_actions);
self.actionPermissions = data.administrator_action_permissions;

Expand Down Expand Up @@ -587,6 +590,10 @@
self.globalStatusMessage(messages.success).globalStatusMessageType('success');
}

// if this is a redirect, redirect the user to the supplied url
if (response.redirect)
window.location.href = response.redirect;

//if there was a file download initiated, redirect the user to the file download address
if (response.download)
self.downloadFile(response.download);
Expand Down Expand Up @@ -1532,4 +1539,4 @@
if ($('#admin_page').length)
window.admin = new admin();
});
})(jQuery);
})(jQuery);
Loading

0 comments on commit 7d17e35

Please sign in to comment.