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

Redirect to list on delete table vis #2697

Merged
merged 4 commits into from
Mar 10, 2015
Merged

Redirect to list on delete table vis #2697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5b21d6
Redirect to tables or datasets
Mar 10, 2015
c3d60cd
Bump version
Mar 10, 2015
55d2c17
Update NEWS
Mar 10, 2015
069ab45
Always redirect to tables
Mar 10, 2015
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
3 changes: 2 additions & 1 deletion NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@

Bugfixes:
* Fixes an error that preventing the load of WMS layers.
* Fixes an unncessary binding that made the dashboard reloading twice.
* Fixes an unncessary binding that made the dashboard reloading twice.
* Fix markdown from descriptions not rendered correctly in dashboard view [#2572](https://github.com/CartoDB/cartodb/issues/2572)
* Fix new dashboard URLs creation [#2662](https://github.com/CartoDB/cartodb/pull/2662)
* Redirect to list on delete table vis [#2697](https://github.com/CartoDB/cartodb/pull/2697)

3.8.1 (2015-02-26)
------------------
Expand Down
2 changes: 1 addition & 1 deletion config/frontend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#This file defines the version of the frontend code that is going to be loaded.
3.7.21
3.7.22
8 changes: 4 additions & 4 deletions lib/assets/javascripts/cartodb/table/header/options_menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ cdb.admin.HeaderOptionsMenu = cdb.admin.DropdownMenu.extend({
this.table = this.model.map.layers && this.model.map.layers.last().table;
this.user = this.options.user;
this.dataLayer = this.options.dataLayer;

opts.isVisualization = this.model.isVisualization();
opts.table = this.table;
opts.dataLayer = this.options.dataLayer;

// Get ownership from the visualization or from the table selected
// depending the type of it (table or derived)
// opts.isOwner = this[ this.model.isVisualization() ? 'model' : 'table' ].permission.isOwner(this.options.user);
Expand Down Expand Up @@ -200,7 +200,7 @@ cdb.admin.HeaderOptionsMenu = cdb.admin.DropdownMenu.extend({
this.delete_dialog.ok = function() {
self.model.destroy({
success: function() {
window.location.href = cdb.config.prefixUrl() + "/dashboard/"
window.location = cdb.config.prefixUrl() + "/dashboard/tables"
}
});
};
Expand Down Expand Up @@ -231,7 +231,7 @@ cdb.admin.HeaderOptionsMenu = cdb.admin.DropdownMenu.extend({
e.preventDefault();

if (!this.options.geocoder.isGeocoding() && !this.table.isSync() && !this.table.isInSQLView()) {

dlg = new cdb.admin.GeocodingDialog({
table: this.table,
user: this.user,
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
"version": "3.7.21",
"version": "3.7.22",
"description": "CartoDB UI frontend",
"repository": {
"type": "git",
Expand Down