rbbt-rest 1.7.5 → 1.7.6

data/share/views/public/js/rbbt.basic.js

@@ -84,3 +84,7 @@ rbbt.LS.store = function(key, value){
 }
 
 
+// 
+rbbt.logged_in = function(){
+  return (undefined !== user && user != 'none')
+}

data/share/views/public/js/rbbt.favourites.js

@@ -240,6 +240,7 @@ fav_module.update_map_selects= function(){
    var select = $(this);
    fav_module._update_map_select(select, type, maps);
   })
+
   $('select.favourite_maps[type=All]').each(function(){
    var select = $(this);
    select.append($('<option class="automatic_load ui" disabled>'+ type +'</option>'));
@@ -269,6 +270,6 @@ fav_module.hooks = function(){
 }
 
 fav_module.update = function(){
- //fav_module.update_favourites().then(fav_module.view).then(function(){ $('.dropdown:not([tabindex])').dropdown()}).then(fav_module.hooks)
- fav_module.update_favourites().then(fav_module.view).then(function(){ $('.__dropdown:not([tabindex])').dropdown()}).then(fav_module.hooks)
+ if (rbbt.logged_in())
+  fav_module.update_favourites().then(fav_module.view).then(function(){ $('.__dropdown:not([tabindex])').dropdown()}).then(fav_module.hooks)
 }

data/share/views/public/js/rbbt.js

@@ -26,6 +26,11 @@ rbbt.log = function(obj){
   console.log((new Date()).toString() + ' => ' + obj)
 }
 
+rbbt.caller = function(){
+  var err = new Error();
+  return err.stack;
+}
+
 rbbt.mount = function(obj, component){
   obj.className = obj.className + ' mithril-mount'
   m.mount(obj, component)

data/share/views/public/js/rbbt.modal.js

@@ -4,6 +4,7 @@ ModalComponent = function(element){
   var component = {}
 
   component.vm = {
+    url: undefined,
     element: element,
     init: function(){ 
       this.visible = m.prop(false)
@@ -29,6 +30,7 @@ ModalComponent = function(element){
     ctrl.show = function(content, title){
       this._set(content, title)
       $(this.vm.element).addClass('active')
+      ctrl.vm.url = undefined
       m.redraw()
       update_rbbt()
     }
@@ -51,19 +53,27 @@ ModalComponent = function(element){
       $(this.vm.element).addClass('loading')
       $(this.vm.element).addClass('active')
       m.redraw()
+      ctrl.vm.url = url
       return rbbt.insist_request(params).then(function(content){
         $(ctrl.vm.element).removeClass('loading')
         ctrl.show(content, title)
+        ctrl.vm.url = url
       })
     }
 
     ctrl.close = function(){
       ctrl.vm.visible(false)
+      ctrl.vm.url = undefined
       $(ctrl.vm.element).removeClass('error')
       $(ctrl.vm.element).removeClass('active')
       m.redraw()
     }
 
+    ctrl.link = function(){
+      ctrl.close()
+      window.location = ctrl.vm.url
+    }
+
     return ctrl
   }
 
@@ -78,7 +88,14 @@ ModalComponent = function(element){
       else content = m.trust(ctrl.vm.content());
 
 
-      var header = [title, rbbt.mview.ibutton({onclick: ctrl.close, class:'small close', style: 'margin-top: -4px'}, m('i.icon.close'))];
+      var header = [title, close_button];
+      var close_button = rbbt.mview.ibutton({onclick: ctrl.close, class:'small close', style: 'margin-top: -4px'}, m('i.icon.close'))
+      if (ctrl.vm.url){
+        var link_button = rbbt.mview.ibutton({onclick: ctrl.link, class:'small link', style: 'margin-top: -4px'}, m('a', {href: ctrl.vm.url},[ m('i.icon.arrow.right')]))
+        header = [title, close_button, link_button];
+      }else{
+        header = [title, close_button];
+      }
       var modal_content = [m('.header', header), m('.content', content)];
       return modal_content;
     }else{

data/share/views/public/js/rbbt/list.js

@@ -26,6 +26,10 @@ body.on('click', 'a.compare_list', function(){
   }
 
   var list_id = rbbt.page.list().id;
+  console.log(list_id)
+  console.log(lists)
+  lists = remove_from_array(lists, list_id)
+  console.log(lists)
 
 
   var buttons = m('.ui.buttons.list_comparison_buttons', [

data/share/views/public/js/rbbt/map.js

@@ -1,6 +1,5 @@
 function entity_map(type, column, id, complete){
   var url = "/entity_map" + '/' + clean_element(type) + '/' + clean_element(column) + '/' + clean_element(id);
-  console.log(url)
   return get_ajax({url: url, async: false, method: "GET", data: {_format: 'json'}}, complete)
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.6
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -198,76 +198,80 @@ files:
 - lib/rbbt/rest/workflow/render.rb
 - share/views/association/Default.haml
 - share/views/compass/app.sass
-- share/views/compass/base/backgrounds.sass
-- share/views/compass/base/blocks.sass
-- share/views/compass/base/color.sass
-- share/views/compass/base/colors.sass
-- share/views/compass/base/font-scale.sass
-- share/views/compass/base/fonts.sass
-- share/views/compass/base/hide.sass
-- share/views/compass/base/icon_content.scss
-- share/views/compass/base/icons.sass
-- share/views/compass/base/material.sass
-- share/views/compass/base/misc.sass
-- share/views/compass/base/screen_sizes.sass
-- share/views/compass/base/text.sass
-- share/views/compass/base/util.sass
-- share/views/compass/base/variables.sass
-- share/views/compass/base/variables/color.sass
-- share/views/compass/blocks.sass
-- share/views/compass/cards.sass
-- share/views/compass/color.sass
-- share/views/compass/color/blocks.sass
-- share/views/compass/color/buttons.sass
-- share/views/compass/color/elements.sass
-- share/views/compass/color/font.sass
-- share/views/compass/color/top_bar.sass
-- share/views/compass/elements.sass
-- share/views/compass/elements/buttons.sass
-- share/views/compass/elements/forms.sass
-- share/views/compass/elements/lists.sass
-- share/views/compass/elements/materials.sass
-- share/views/compass/elements/movement.sass
-- share/views/compass/elements/positions.sass
-- share/views/compass/elements/table.sass
-- share/views/compass/elements/tool.sass
-- share/views/compass/grid.sass
-- share/views/compass/init.sass
+- share/views/compass/card_templates.sass
 - share/views/compass/layout.sass
-- share/views/compass/layout/body.sass
-- share/views/compass/layout/footer.sass
-- share/views/compass/layout/result.sass
-- share/views/compass/layout/reveal.sass
-- share/views/compass/layout/top_bar.sass
-- share/views/compass/layout/top_menu.sass
-- share/views/compass/menu.sass
-- share/views/compass/menu/accordion_menu.sass
-- share/views/compass/menu/actionable.sass
-- share/views/compass/menu/dropdown_menu.sass
-- share/views/compass/menu/hide.sass
-- share/views/compass/menu/menu.sass
-- share/views/compass/menu/tab_menu.sass
-- share/views/compass/menu/top_bar.sass
-- share/views/compass/menu/vertical_menu.sass
-- share/views/compass/mixins/_all.sass
-- share/views/compass/mixins/_blocks.sass
-- share/views/compass/mixins/_compass.sass
-- share/views/compass/mixins/_deps.sass
-- share/views/compass/mixins/_hide.sass
-- share/views/compass/mixins/_keyframes.scss
-- share/views/compass/mixins/_semantic-ui.sass
-- share/views/compass/new.sass
-- share/views/compass/offcanvas.sass
-- share/views/compass/position/basic.sass
-- share/views/compass/responsive.sass
+- share/views/compass/misc.sass
+- share/views/compass/old/base/backgrounds.sass
+- share/views/compass/old/base/blocks.sass
+- share/views/compass/old/base/color.sass
+- share/views/compass/old/base/colors.sass
+- share/views/compass/old/base/font-scale.sass
+- share/views/compass/old/base/fonts.sass
+- share/views/compass/old/base/hide.sass
+- share/views/compass/old/base/icon_content.scss
+- share/views/compass/old/base/icons.sass
+- share/views/compass/old/base/material.sass
+- share/views/compass/old/base/misc.sass
+- share/views/compass/old/base/screen_sizes.sass
+- share/views/compass/old/base/text.sass
+- share/views/compass/old/base/util.sass
+- share/views/compass/old/base/variables.sass
+- share/views/compass/old/base/variables/color.sass
+- share/views/compass/old/blocks.sass
+- share/views/compass/old/cards.sass
+- share/views/compass/old/color.sass
+- share/views/compass/old/color/blocks.sass
+- share/views/compass/old/color/buttons.sass
+- share/views/compass/old/color/elements.sass
+- share/views/compass/old/color/font.sass
+- share/views/compass/old/color/top_bar.sass
+- share/views/compass/old/elements.sass
+- share/views/compass/old/elements/buttons.sass
+- share/views/compass/old/elements/forms.sass
+- share/views/compass/old/elements/lists.sass
+- share/views/compass/old/elements/materials.sass
+- share/views/compass/old/elements/movement.sass
+- share/views/compass/old/elements/positions.sass
+- share/views/compass/old/elements/table.sass
+- share/views/compass/old/elements/tool.sass
+- share/views/compass/old/grid.sass
+- share/views/compass/old/init.sass
+- share/views/compass/old/layout.sass
+- share/views/compass/old/layout/body.sass
+- share/views/compass/old/layout/footer.sass
+- share/views/compass/old/layout/result.sass
+- share/views/compass/old/layout/reveal.sass
+- share/views/compass/old/layout/top_bar.sass
+- share/views/compass/old/layout/top_menu.sass
+- share/views/compass/old/menu.sass
+- share/views/compass/old/menu/accordion_menu.sass
+- share/views/compass/old/menu/actionable.sass
+- share/views/compass/old/menu/dropdown_menu.sass
+- share/views/compass/old/menu/hide.sass
+- share/views/compass/old/menu/menu.sass
+- share/views/compass/old/menu/tab_menu.sass
+- share/views/compass/old/menu/top_bar.sass
+- share/views/compass/old/menu/vertical_menu.sass
+- share/views/compass/old/mixins/_all.sass
+- share/views/compass/old/mixins/_blocks.sass
+- share/views/compass/old/mixins/_compass.sass
+- share/views/compass/old/mixins/_deps.sass
+- share/views/compass/old/mixins/_hide.sass
+- share/views/compass/old/mixins/_keyframes.scss
+- share/views/compass/old/mixins/_semantic-ui.sass
+- share/views/compass/old/new.sass
+- share/views/compass/old/offcanvas.sass
+- share/views/compass/old/position/basic.sass
+- share/views/compass/old/responsive.sass
+- share/views/compass/old/semantic-ui.css
+- share/views/compass/old/semantic-ui/semantic-ui.css
+- share/views/compass/old/space/button.sass
+- share/views/compass/old/table.sass
+- share/views/compass/old/text.sass
+- share/views/compass/old/variables/colors.sass
+- share/views/compass/old/variables/sizes.sass
 - share/views/compass/screen_sizes.sass
-- share/views/compass/semantic-ui.css
-- share/views/compass/semantic-ui/semantic-ui.css
-- share/views/compass/space/button.sass
-- share/views/compass/table.sass
-- share/views/compass/text.sass
-- share/views/compass/variables/colors.sass
-- share/views/compass/variables/sizes.sass
+- share/views/compass/tab_menu.sass
 - share/views/entity/Default.haml
 - share/views/entity_list/Default.haml
 - share/views/entity_list/Default/edit.haml
@@ -342,11 +346,7 @@ files:
 - share/views/public/img/UI/table.png
 - share/views/public/img/UI/topbar.png
 - share/views/public/img/UI/topbar_wire.png
-- share/views/public/js/_ajax_replace.js
-- share/views/public/js/_ellipsis.js
-- share/views/public/js/_md5.js
 - share/views/public/js/app.js
-- share/views/public/js/defer.js
 - share/views/public/js/foundation/foundation.abide.js
 - share/views/public/js/foundation/foundation.alerts.js
 - share/views/public/js/foundation/foundation.clearing.js
@@ -364,7 +364,11 @@ files:
 - share/views/public/js/foundation/foundation.tooltips.js
 - share/views/public/js/foundation/foundation.topbar.js
 - share/views/public/js/foundation/index.js
-- share/views/public/js/helpers.js
+- share/views/public/js/helpers/_ajax_replace.js
+- share/views/public/js/helpers/_ellipsis.js
+- share/views/public/js/helpers/_md5.js
+- share/views/public/js/helpers/defer.js
+- share/views/public/js/helpers/helpers.js
 - share/views/public/js/rbbt.aesthetics.js
 - share/views/public/js/rbbt.basic.js
 - share/views/public/js/rbbt.entity.js
@@ -372,7 +376,6 @@ files:
 - share/views/public/js/rbbt.entity_map.js
 - share/views/public/js/rbbt.exception.js
 - share/views/public/js/rbbt.favourites.js
-- share/views/public/js/rbbt.favourites.js.old
 - share/views/public/js/rbbt.job.js
 - share/views/public/js/rbbt.js
 - share/views/public/js/rbbt.knowledge_base.js
@@ -382,17 +385,11 @@ files:
 - share/views/public/js/rbbt.views.js
 - share/views/public/js/rbbt/actions.js
 - share/views/public/js/rbbt/dom_update.js
-- share/views/public/js/rbbt/favourites.js
 - share/views/public/js/rbbt/fragment.js
-- share/views/public/js/rbbt/hide.js
 - share/views/public/js/rbbt/list.js
 - share/views/public/js/rbbt/map.js
-- share/views/public/js/rbbt/menu.js
-- share/views/public/js/rbbt/modal.js
-- share/views/public/js/rbbt/page_type.js
 - share/views/public/js/rbbt/reveal.js
 - share/views/public/js/rbbt/table.js
-- share/views/public/js/rbbt/workflow.js
 - share/views/public/plugins/FileSaver/js/FileSaver.js
 - share/views/public/plugins/angular/angular.js
 - share/views/public/plugins/cola/js/cola.js

data/share/views/public/js/rbbt.favourites.js.old

@@ -1,195 +0,0 @@
-
-
-rbbt.favourites = {};
-
-var fav_module = rbbt.favourites;
-
-fav_module.update_favourite_entities = function(){
- return m.request({method: 'GET', url: '/favourite_entities'}).then(function(data){
-  fav_module.favourite_entities = {}
-  for (type in data){
-   var type_data = data[type]
-   fav_module.favourite_entities[type] = {}
-   for (entity in type_data){
-    var info = type_data[entity]
-    info.id = entity
-    info.type = type
-    fav_module.favourite_entities[type][entity] = new Entity(info)
-   }
-  }
-  return data
- })
-}
-
-fav_module.update_favourite_lists = function(){
- return m.request({method: 'GET', url: '/favourite_entity_lists'}).then(function(data){
-  fav_module.favourite_lists = {}
-  for (type in data){
-   var type_data = data[type]
-   fav_module.favourite_lists[type] = {}
-   for (i in type_data){
-    var list = type_data[i]
-    info = {}
-    info.id = list
-    info.type = type
-    fav_module.favourite_lists[type][list] = new EntityList(info)
-   }
-  }
-  return data
- }) //.then(fav_module.update_list_selects)
-}
-
-fav_module.update_favourites = function(){
- return fav_module.update_favourite_entities().then(fav_module.update_favourite_lists)
-}
-
-fav_module.isFavourite_entity = function(entity){
- var favourites = fav_module.favourite_entities
- return favourites[entity.type] !== undefined && favourites[entity.type][entity.id] !== undefined
-}
-
-fav_module.isFavourite_list = function(list){
- var favourites = fav_module.favourite_lists
- return favourites[list.type] !== undefined && favourites[list.type][list.id] !== undefined
-}
-
-fav_module.toggleFavourite_entity = function(){
- var entity = rbbt.page.entity();
-
- if (fav_module.isFavourite_entity(entity)){
-  rbbt.post({url: '/remove_favourite_entity/' + entity.type + '/' + entity.id}).then(fav_module.update)
- }else{
-  rbbt.post({url: '/add_favourite_entity/' + entity.type + '/' + entity.id, data: entity.info}).then(fav_module.update)
- }
-}
-
-fav_module.toggleFavourite_list = function(){
- var list = rbbt.page.list();
-
- if (fav_module.isFavourite_list(list)){
-  rbbt.post({url: '/remove_favourite_entity_list/' + list.type + '/' + list.id}).then(fav_module.update)
- }else{
-  rbbt.post({url: '/add_favourite_entity_list/' + list.type + '/' + list.id}).then(fav_module.update)
- }
-}
-
-fav_module.toggleFavourite = function(){
- if (! rbbt.page.entity())
-  if (! rbbt.page.list())
-   return
-  else
-   fav_module.toggleFavourite_list()
- else
-   fav_module.toggleFavourite_entity()
-}
-
-//{{{ VIEWS
-
-fav_module.star_view = function(){
- if (! rbbt.page.entity())
-  if (! rbbt.page.list())
-   return
-  else
-   return m('i.icon.star', {class: (fav_module.isFavourite_list(rbbt.page.list()) ? 'favourite' : 'not_favourite')})
- else
-  return m('i.icon.star', {class: (fav_module.isFavourite_entity(rbbt.page.entity()) ? 'favourite' : 'not_favourite')})
-}
-
-fav_module.draw_favourite_menu = function(){
- var favourites = fav_module.favourite_entities
- var types = Object.keys(favourites)
-
- return m('.ui.menu',
-          m('.ui.dropdown.item', [
-           m('i.icon.dropdown'), 
-           'Entities',
-           m('.menu', types.map(function(type, index){ 
-            var _type = favourites[type]
-            var entities = Object.keys(_type)
-
-            return m('.ui.dropdown.item', [
-             m('i.icon.dropdown'), 
-             type,
-             m('.menu', entities.map(function(entity, index){ url = _type[entity].url(); return m('a.item', {href: url}, _type[entity].name) }))
-            ]);
-           }))
-          ])
-         )
-}
-
-fav_module.draw_favourite_list_menu = function(){
- var favourites = fav_module.favourite_lists
- var types = Object.keys(favourites)
-
- return m('.ui.menu',
-          m('.ui.dropdown.item', [
-           m('i.icon.dropdown'), 
-           'Lists',
-           m('.menu', types.map(function(type, index){ 
-            var _type = favourites[type]
-            var lists = Object.keys(_type)
-
-            return m('.ui.dropdown.item', [
-             m('i.icon.dropdown'), 
-             type,
-             m('.menu', lists.map(function(lists, index){ url = _type[lists].url(); return m('a.item', {href: url}, _type[lists].name) }))
-            ]);
-           }))
-          ])
-         )
-}
-fav_module.view = function(){
- m.render($('#top_menu > .favourite')[0], [
-  m('.item.pointer', {onclick: fav_module.toggleFavourite}, fav_module.star_view()), 
-  m('.item', {style: 'padding: 0px'}, fav_module.draw_favourite_menu()),
-  m('.item', {style: 'padding: 0px'}, fav_module.draw_favourite_list_menu())
- ])
-}
-
-fav_module.update = function(){
- fav_module.update_favourites().then(fav_module.view).then(function(){ $('.dropdown:not([tabindex])').dropdown()})
-}
-
-
-fav_module._update_list_select= function(select, type, lists){
- if (select.attr('attr-allow-empty') == 'true'){
-  var option = $('<option value="none" class="loaded">none</option>')
-  select.append(option);
- }
-
- var selected = null;
-
- if (select.attr('attr-selected') != undefined ){
-  selected = select.attr('attr-selected');
- }
-
- $.each(lists, function(name, elems){
-  var option = null;
-  var name = elems
-  if (selected == null || name != selected){
-   option = $('<option attr-entity_type="' + type + '" class="automatic_load" value="' + name.id + '">' + name.id + '</option>');
-  }else{
-   option = $('<option attr-entity_type="' + type + '" class="automatic_load" selected=selected value="' + name.id + '">' + name.id + '</option>');
-  }
-  select.append(option);
-  return true
- })
-},
-
-fav_module.update_list_selects= function(){
- $('select.favourite_lists').find('option.automatic_load').remove()
-
- $.each(fav_module.favourite_lists, function(type, lists){
-  $('select.favourite_lists[type=' + type + ']').each(function(){
-   var select = $(this);
-   fav_module._update_list_select(select, type, lists);
-  })
-  $('select.favourite_lists[type=All]').each(function(){
-   var select = $(this);
-   select.append($('<option class="automatic_load ui" disabled>'+ type +'</option>'));
-   fav_module._update_list_select(select, type, lists);
-  })
- });
-}
-
-fav_module.update()