Map XML
Index: openacs-4/contrib/packages/simulation/www/citybuild/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/index.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/citybuild/index.tcl 13 Nov 2003 14:55:26 -0000 1.2
+++ openacs-4/contrib/packages/simulation/www/citybuild/index.tcl 2 Dec 2003 13:46:53 -0000 1.3
@@ -8,10 +8,15 @@
{type:optional}
}
+
set page_title "CityBuild"
set context [list $page_title]
set package_id [ad_conn package_id]
+
+permission::require_permission -object_id $package_id -privilege sim_object_create
+
set admin_p [permission::permission_p -object_id $package_id -privilege admin]
+set map_p [expr $admin_p ||[permission::permission_p -object_id $package_id -privilege sim_set_map_p]]
set notification_widget [notification::display::request_widget \
-type [simulation::notification::xml_map::type_short_name] \
Index: openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/object-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp 13 Nov 2003 14:19:24 -0000 1.1
+++ openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp 2 Dec 2003 13:46:53 -0000 1.2
@@ -50,3 +50,5 @@
+TODO: Show on map should be read-only unless user has "sim_set_map_p"
+priv on package_id
\ No newline at end of file
Index: openacs-4/contrib/packages/simulation/www/citybuild/object-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/object-edit.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/contrib/packages/simulation/www/citybuild/object-edit.tcl 28 Nov 2003 13:15:09 -0000 1.5
+++ openacs-4/contrib/packages/simulation/www/citybuild/object-edit.tcl 2 Dec 2003 13:46:53 -0000 1.6
@@ -559,8 +559,15 @@
} -new_data {
- permission::require_permission -privilege create -object_id [ad_conn package_id]
+ # TODO
+ # For now, assume we are always using this to create global objects
+ # When we use this form to create case objects, we should simply check for create permission on the case
+ # we could alternately switch to using the cr folder system, in which case:
+ # sim_object_create on package_id is replaced by 'create' on a root folder, and
+ # create on a case is replaced by create on a case's folder
+ permission::require_permission -privilege sim_object_create -object_id [ad_conn package_id]
+
set existing_items [db_list select_items { select name from cr_items where parent_id = :parent_id }]
if { [empty_string_p $name] } {
Index: openacs-4/contrib/packages/simulation/www/doc/data-model.dia
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/doc/Attic/data-model.dia,v
diff -u -N -r1.5 -r1.6
--- openacs-4/contrib/packages/simulation/www/doc/data-model.dia 28 Nov 2003 13:28:57 -0000 1.5
+++ openacs-4/contrib/packages/simulation/www/doc/data-model.dia 2 Dec 2003 13:46:53 -0000 1.6
@@ -1,98 +1,95 @@
-� �}�r�8��>�B������H�`k�'����-�_ML�lrà%Z�$*H��o )�)�A�P��SU��a^�8�܋��ϯ����$/�l��GJ���d�Ȗ�v�����㟷�����,��/��Uof�7�����e��˧OOOOd�\�e��u�H������������_?�f�^`������qY���c�̶�&���]���ʳ���c=j?n���|�g����O��??�/���:'���W�]��_�/���p̥wI�f��R>t\G���1�Q��]����y?շ���۵�n��H���U�=�#�ͺ~�����ի��^=�z���vY^�qZ[�˲uok#��H�*�Z����ƹ�x�ܧe��̣�#O�|86�nK�OC^�!IW����o��}��X����8�q��9E_�>��O�6�l���i�ޭ��9�~�����\��Uk�ۯ���:��Hx/R��t�=/�ᘎ+=�}�{��q���V#d�L���$�_��o��l��}�7O!���dQ���u��x��rv;�{���[�#C�t���ߜ��Ӝ���t�Gh���E�ApC9m���ot]��y�\N ޮ�Ɂ���.�摀�3���M����qd2Ռ*M7��1��#/�;���e�2����1��!�{��a6��Vׄ3r�C��D����+�x�<�h����k��Ƿ7�t=�*$?�;b�KMW�m�6C����x���������(��O�έ������L�t뺇�AK��p3#�n��1�2搾�%3��I���[��1$C��v�����q�z�
-G�VԮ���ۂصB�.W�e�/;Hj�@R*↺!�(��R*S�[�r}V-�T}�3�5��jN2M��ӓ�~2�Pnw���W��q&&��q���3�+��2},N,u����#aft�"S鞝��ʿ�3��j3b7(6��^h�l���1bc���JhK��' ���_����u\-�kN��~ƣ��z)�O-�qjɵ�"�NNg��GǪz�%#b�����W��h�E�JZ�5�L�$S�k�5cO
-�\?^Q����T|'7^��B��q��哏^PX7��<.��f�%١9��Nj��Mi��Y�s��I�����oP��ڍr�Y���Q#,:�6�6+v�"9��~��4����;b�[�e��M���Ũ���&*fP���T�
-OG}��DLt'{5?�ue�w�wƮ��w͞�`�3s����G�����}�Z�R����C?n֯����G
-�F��~>�n�F�۶�'�xK����Y��%]�����k�i>�5ee#�hT,��c�����Y S���f�}�,�b��;��r� G9�TF����
-p�h�f!7k� j��F5��� .��2=\��x�ފ���� =Xl �p\ ���̢\�v�. ��E\ 8 �38�y���� :㠃Uй*��\|+!��S���I�%�*�^�_6X3�����n8`��ث����usۍ�����.hE�P@���BX�O�=a�� ��$���X@�j��y$�=���LU��|�����{�M0M��br鴹v2⺮w���z��v� ��{�a��ۻ��U��8�b=�2�/��s��曕�zS(u��°���i89�����͕�����Ķs�U�g,��/�> ]�W]������u0���W+K��ߧ�eE���p*�M���E{�i89�u��
-a�4n�n��;˅�s;��K�Y�Y�B[����������n/k*��ڎB7��
-eL. �ݎ��S�A8�V�1�'�� �w�p�K���mt�f���\�C�Sa�
-�g�F����:�C��D�G�l�7lS�3٘�_�\"�g�ș�) �������K�&�'��ةks
-g��0���s!�.�t_~j~d�\:k\qa����o �)�����7�QV��3�&����pH`��G6}��2�[�㮠K?Z�5?Z�5?Z�5?Z�Oj ��њ�-����&Οg_���}���W鵌�x6i���]��P��]�%e$����H��$�q��w_2�
-�������vlA�A�ބq�����(�%^e�%.����6'���}N%߇_�U�]�;=�����|
-�A���y�E��J�)w������ٿ���[h\u��;Y��:��4�Ce����$���fY�0�<�J��Z�f� �#����u%�
-!����
+� �}As�8���~����a�� ��vo����z�7�{/ua�-sK$=._����l�(R BU�_Wtwن�ŗH�|������Y����E�m�H��q�l�2ݮ~�����V|��_>��2��"�]��f&c[��~��P���|����D��E\f9Y���H>��x��?�A�>��a6��˸����ߍ�2O��d��7����ŗU�=n��Q�q�l����?�t_�����2��s�ڻx���I���Ҏ�'�\z����nvY��!���hH�u���U�A��/?�������7ޮ�v��F�M�����l����/�`���^}m��ի�E���2�����]���x[���E2�P�����85
+�0��o�>-ˬge��YxJ��ñ�t[��I�z(
+/_��C=�*O�������T�)�����Z��g{����:i������/�<�囟Q������;Q_�s�Z��'|�"�zL�I������~ا�����`�o5B���:~N�����,�����|����K�~z�XgO��8/g���e_?�?2�I�?��9|>�ɫI'~�v��[t7��朏�F����W����j�X���!��o �8s�:�D�,�G&Sͨ2�t�
+���?�⍫���]�/������b�7�f#�nuM8#�QΊ�Y�D���_��d���L�{��N-� 73r�f��+c�\�0CkM�tn��C24_m7I�G�l7-��p�mE�
+>�-�]+�r�Y���s���$��p!n��2�+�2廵)�gՒI��>#�XӚ��$��Y>=y}��'s �v�{���gbb��غ1S�RQ/����RGܞ���?f�@*2������[;s�VQ1#v�b�����flL#6Fl|�����V���x��x������\.]�EѲ`��ԑ_�g����uS�.��Rzk�^���z�:ߔ��5;�Y���Zh�\�E��Q��(w��x5¢�h�m�b/�����1O�|�� ��!&��]�~�d��!]���Inb�b���[8�Nũ�t�1�N�Dw���P�YWz�yg�*�|��Y: �=3�oK|4��i�ܷo��)u���=��f�:�/}�kD_���a��m�|ҏ�t�Z��
+Z�uZ>��κ���� YSV6��)�F�"k1F��ة�2eZ��`����2)y�S{> �r���Iet�.� 7��6nr�&_ ��j�Q� .��� .��E��ꭘ�[� =@Ѓ�p\ �p��Y�,��mG��p �!�Y��� 8��s�g�9��3:Xu ���Π�ŷ�O=eɛ��^b�����a�5�n
+�qqh��V[����
+^7ױ�H�p^߿���V�P@�P��{(�U�����пH� z���_�G߳�[��T�[�W����8a`������-&�N�k'#��z��~��w�j����wP,�m��K<_���#(���,���2�8g�l�Y��7�R��/[�i,�����q���\9�я �Nl;�[5Ʋ9���Х~Օ��yߙ:[�>}������}ʌPVT�>A �r�t��=^������Y7]N�6O���fﺳ\�?W�#�����u/��y/kJ�������2��(t�P���P�����hm