scrivito_sdk 1.1.1 → 1.2.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (53) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/scrivito/blobs_controller.rb +7 -0
  3. data/app/controllers/scrivito/objs_controller.rb +0 -6
  4. data/app/controllers/scrivito/ui_controller.rb +2 -0
  5. data/app/views/scrivito/blobs/{activate_upload.json.jbuilder → blob.json.jbuilder} +0 -0
  6. data/config/ca-bundle.crt +1 -1
  7. data/config/precedence_routes.rb +1 -1
  8. data/lib/assets/javascripts/scrivito_ui.js +20072 -19687
  9. data/lib/assets/stylesheets/scrivito.css +1 -1
  10. data/lib/assets/stylesheets/scrivito_ui.css +1 -1
  11. data/lib/generators/scrivito/install/install_generator.rb +2 -8
  12. data/lib/generators/scrivito/install/templates/app/views/download/details.html.erb +11 -0
  13. data/lib/generators/scrivito/install/templates/app/views/headline_widget/thumbnail.html.erb +1 -1
  14. data/lib/generators/scrivito/install/templates/app/views/image/details.html.erb +17 -0
  15. data/lib/generators/scrivito/install/templates/app/views/image_widget/thumbnail.html.erb +1 -1
  16. data/lib/generators/scrivito/install/templates/app/views/page/details.html.erb +4 -2
  17. data/lib/generators/scrivito/install/templates/app/views/page/thumbnail.html.erb +1 -3
  18. data/lib/generators/scrivito/install/templates/app/views/text_widget/thumbnail.html.erb +2 -2
  19. data/lib/generators/scrivito/page/page_generator.rb +8 -0
  20. data/lib/generators/scrivito/page/templates/details.html.erb +4 -2
  21. data/lib/generators/scrivito/page/templates/thumbnail.html.erb +1 -3
  22. data/lib/generators/scrivito/widget/templates/details.html.erb +4 -2
  23. data/lib/generators/scrivito/widget/templates/show.html.erb +1 -2
  24. data/lib/generators/scrivito/widget/templates/thumbnail.html.erb +1 -3
  25. data/lib/generators/scrivito/widget/widget_generator.rb +0 -4
  26. data/lib/scrivito/attribute_content.rb +44 -15
  27. data/lib/scrivito/attribute_definition.rb +59 -3
  28. data/lib/scrivito/basic_obj.rb +11 -18
  29. data/lib/scrivito/basic_widget.rb +42 -0
  30. data/lib/scrivito/binary.rb +5 -5
  31. data/lib/scrivito/cache_middleware.rb +13 -17
  32. data/lib/scrivito/class_collection.rb +1 -1
  33. data/lib/scrivito/client_attribute_serializer.rb +5 -1
  34. data/lib/scrivito/cms_backend.rb +43 -60
  35. data/lib/scrivito/cms_data_cache.rb +18 -14
  36. data/lib/scrivito/cms_field_tag.rb +2 -2
  37. data/lib/scrivito/cms_rest_api.rb +9 -8
  38. data/lib/scrivito/cms_routing.rb +1 -1
  39. data/lib/scrivito/configuration.rb +15 -4
  40. data/lib/scrivito/connection_manager.rb +29 -23
  41. data/lib/scrivito/model_library.rb +43 -11
  42. data/lib/scrivito/obj_collection.rb +1 -1
  43. data/lib/scrivito/obj_params_parser.rb +1 -19
  44. data/lib/scrivito/obj_search_enumerator/query_executor.rb +1 -1
  45. data/lib/scrivito/obj_search_enumerator.rb +1 -1
  46. data/lib/scrivito/ui_config.rb +13 -2
  47. data/lib/scrivito/widget_collection.rb +1 -1
  48. data/lib/scrivito/workspace.rb +25 -26
  49. data/lib/scrivito_sdk.rb +67 -40
  50. metadata +21 -8
  51. data/lib/generators/scrivito/install/templates/app/views/download/embed.html.erb +0 -1
  52. data/lib/generators/scrivito/install/templates/app/views/image/embed.html.erb +0 -1
  53. data/lib/scrivito/widget_garbage_collection.rb +0 -97
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7ed657cd94147d733215b1d1ae8f7202da06289c
4
- data.tar.gz: fd1de99ae53a5b1b37f91c71cc3b4b3c2856acae
3
+ metadata.gz: bcb9c6155591fdd6da194ee62f1955f9e9b25ec8
4
+ data.tar.gz: cb2daf392549cf48499a181784fa0f620de21aa7
5
5
  SHA512:
6
- metadata.gz: 766b279180640d87811fcfc7721e3f9ef44c4e2a7801ba9cc10a63002021cc75de286b4295794356442fff28e553fb1dde5af5b8fd41bf87ff271c2daf082274
7
- data.tar.gz: 36e338ec6084f6ea0bb4531fb5ad3755d84497efe3c1530fbeb13d640b6e1d5f93d42f3c8f9f07b604dcb9247b8ca3a983fbac84c2eff8b3c6e0fa3afdd2d06f
6
+ metadata.gz: 739a7d0f4c0a4614c34424e1a987646b9b25cbef8488d95cdc3c3badf544619345458833e299cd0d9ba595b1ff42a305813a8b38a0d2f25f00cfcd83d3fd764f
7
+ data.tar.gz: 273463e6a3f62f8b6b637f2b9e4ec2a9a456c1323a4c994fccaed96e67b2a5532c92700ebca89839fc58c28677791e44f4280c82e8e6957c3cf3fdb891157f33
@@ -7,6 +7,13 @@ class BlobsController < WebserviceController
7
7
 
8
8
  def activate_upload
9
9
  @blob = CmsRestApi.activate_upload(params.slice(:upload, :obj_id, :filename, :content_type))
10
+ render :blob
11
+ end
12
+
13
+ def copy
14
+ @blob = CmsRestApi.copy_binary(params.delete(:id_to_copy),
15
+ params.slice(:destination_obj_id, :filename, :content_type))
16
+ render :blob
10
17
  end
11
18
  end
12
19
 
@@ -4,7 +4,6 @@ module Scrivito
4
4
  :copy,
5
5
  :create,
6
6
  :destroy,
7
- :destroy_widget,
8
7
  :duplicate,
9
8
  :mark_resolved,
10
9
  :restore,
@@ -62,11 +61,6 @@ module Scrivito
62
61
  end
63
62
  end
64
63
 
65
- def destroy_widget
66
- in_selected_workspace { current_widget.destroy }
67
- render_empty_json
68
- end
69
-
70
64
  def revert
71
65
  in_selected_workspace { current_obj.revert }
72
66
  render_empty_json
@@ -9,6 +9,8 @@ class UiController < ActionController::Base
9
9
  resource: resource,
10
10
  return_to: params[:return_to],
11
11
  app_extension_tags: app_extension_tags,
12
+ obj_models: Scrivito.models.objs,
13
+ widget_models: Scrivito.models.widgets,
12
14
  ).to_json
13
15
  else
14
16
  redirect_to @application_src
data/config/ca-bundle.crt CHANGED
@@ -1,7 +1,7 @@
1
1
  ##
2
2
  ## Bundle of CA Root Certificates
3
3
  ##
4
- ## Certificate data from Mozilla as of: Tue Feb 9 14:34:27 2016
4
+ ## Certificate data from Mozilla as of: Wed Feb 24 15:30:51 2016
5
5
  ##
6
6
  ## This is a bundle of X.509 certificates of public Certificate Authorities
7
7
  ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -30,7 +30,6 @@ Scrivito::SdkEngine.routes.draw do
30
30
  put :revert
31
31
  put :restore
32
32
  put :mark_resolved
33
- put :destroy_widget
34
33
  put :revert_widget
35
34
  put :restore_widget
36
35
  put :transfer_modifications
@@ -41,6 +40,7 @@ Scrivito::SdkEngine.routes.draw do
41
40
 
42
41
  get 'blobs/upload_permission' => 'blobs#upload_permission', defaults: {format: :json}
43
42
  put 'blobs/activate_upload' => 'blobs#activate_upload', defaults: {format: :json}
43
+ put 'blobs/copy' => 'blobs#copy', defaults: {format: :json}
44
44
 
45
45
  resources :workspaces,
46
46
  controller: 'workspaces',