Merge branch 'master' into development

OSBI · Jun 25, 2015 · 52d2a24 · 52d2a24
2 parents a3effc3 + 8ca68dc
commit 52d2a24
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/js/saiku/embed/SaikuEmbed.js b/js/saiku/embed/SaikuEmbed.js
@@ -279,6 +279,8 @@ var SaikuClient = (function() {
 					var parametersLevels;
 
 					if (self.settings.dashboards) {
+						renderMode = options.render;
+						mode = options.mode;
 						parametersLevels = joinParameters(dataSchema, dataAxis);
 						$(options.htmlObject).closest('.gs-w').data('parametersLevels', JSON.stringify(parametersLevels));
 						$(options.htmlObject).closest('.gs-w').data('parametersValues', JSON.stringify(parametersValues));

diff --git a/js/saiku/views/SaveQuery.js b/js/saiku/views/SaveQuery.js
@@ -60,7 +60,7 @@ var SaveQuery = Modal.extend({
         this.message = _.template(
             "<form id='save_query_form'>" +
             "<label for='name' class='i18n'>File:</label>&nbsp;" +
-            "<input type='text' name='name' value='<%= name %>' /> <span class='save sprite'></span>" +
+            "<input type='text' name='name' value='<%= name %>' />" +
             "<div class='RepositoryObjects'><span class='i18n'>Loading...</span></div>" +
             "<br />"+
             "</form>"+
@@ -278,6 +278,9 @@ return false;
                 return true;
         };
 
+        // Rename tab
+        this.query.workspace.tab.$el.find('.saikutab').text(file.replace(/^.*[\\\/]/, '').split('.')[0]);
+
         (new SavedQuery({
             name: this.query.get('name'),
             file: file,