amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4576 commits 8 branches 146 tags 314 MiB
Commit graph

1382 commits

Author SHA1 Message Date
PCoder
85f7d73442 Code cleanup: Remove ssh_key_added_to_vm email templates 2019-06-25 02:32:19 +02:00
PCoder
6d3b5f40c0 Merge remote-tracking branch 'mainRepo/master' into task/5509/add-keys-to-opennebula-user 2019-06-25 02:29:15 +02:00
PCoder
0cf5e541cc Code cleanup: remove VM poweroff/resume methods + styles + html code 2019-06-25 02:24:14 +02:00
PCoder
08608c726f Code cleanup: remove updating ssh keys on live VMs 2019-06-25 02:11:57 +02:00
PCoder
1e68ecb047 Confirm order button close: Redirect only to url specified 2019-06-24 04:31:29 +02:00
PCoder
1ebfc8b2dc Don't use VirtualMachineSerializer for obtaining users_vms 2019-06-10 14:51:40 +02:00
PCoder
496178f44c Check if VM belongs to user against opennebula backend 2019-06-08 04:40:16 +02:00
William Colmenares
5ad871f124 updated for read vm realm 2019-05-16 16:35:44 -04:00
Mondi Ravi
c469948901 Merge branch 'william' into 'master' 
Add view to check if the vm belongs to a user (for ungleich-cli)

See merge request ungleich-public/dynamicweb!705
 2019-05-16 22:01:21 +02:00
William Colmenares
a82ecbe4d5 fix typho in check_vm 2019-05-16 13:34:13 -04:00
William Colmenares
ce630573e0 Remove print statement & correct code return 2019-05-16 13:33:31 -04:00
PCoder
94d5c34152 [hosting/bill] Skip creating MHB for invoices that have been imported already 2019-05-13 21:15:38 +02:00
William Colmenares
69ec7d2b46 reuse of the env variable in the base settings 2019-05-13 03:44:09 -04:00
PCoder
72ea362d01 Remove duplicated blocktrans in txt email template 2019-05-13 08:01:11 +02:00
PCoder
9fd396363f Center the add ssh key nicely 2019-05-13 07:13:49 +02:00
William Colmenares
1faf46cc1b added validation to heck if the user is the one allowed to access 2019-05-12 21:34:10 -04:00
PCoder
641c556bb6 Simplify code 2019-05-12 21:16:46 +02:00
PCoder
f2af1f8708 Rename button id 2019-05-12 21:15:48 +02:00
PCoder
bbe0017fa0 Add missing return statements for error 2019-05-12 21:15:15 +02:00
PCoder
a44d50dd69 Fix wrong comparing of public_key object with a string value 2019-05-12 19:56:14 +02:00
PCoder
d38edb0dfa Add url for AddSshKeyToVMView 2019-05-12 19:22:10 +02:00
PCoder
09ab9a714d Add AddSshKeyToVMView 2019-05-12 19:21:19 +02:00
PCoder
0104a804c2 Do not allow comma in SSH key name 2019-05-12 19:20:35 +02:00
PCoder
c9c91b1ecb JS code to handle the add ssh key functionality 2019-05-12 19:19:40 +02:00
PCoder
61127e56ca Update virtual_machine_detail.html template 
To show the Add SSH key button and the modal that pops up after clicking
it.
 2019-05-12 19:16:53 +02:00
PCoder
7e538bf37b Add ssh_key_added_to_vm.{html,txt} email templates 2019-05-12 19:12:34 +02:00
PCoder
3133bde0e9 Don't set the key in the live template 2019-05-11 09:15:08 +02:00
PCoder
b189371a7b Call get_all_active_vmids to get the active vmids 2019-05-11 02:38:16 +02:00
PCoder
7f6d4c1c53 Refactor get_all_vmids -> get_all_active_vmids 
We now get this info from opennebula
 2019-05-11 02:23:51 +02:00
PCoder
65c9ccb671 Use save_key_in_opennebula_user and save_key_in_vm_template 2019-05-11 01:54:35 +02:00
PCoder
1d70563ea2 Save user's key in opennebula 2019-05-10 09:19:42 +02:00
William Colmenares
b8ca7286f2 Add view to check if the vm belongs to a user 2019-05-09 01:34:18 -04:00
PCoder
f0dfcccd96 Increase configuration length in VMDetail to 128 chars 2019-05-08 23:42:03 +02:00
PCoder
d8b95abb39 Check private key is true 2019-05-06 08:48:26 +02:00
PCoder
71d1e6e3c9 Add delete method for UserHostingKey 2019-04-28 23:13:54 +02:00
PCoder
1ccb4e9790 Correct the way we get periods for invoices list 2019-04-22 11:40:00 +02:00
PCoder
965cc3adf9 Show correct period start and period end in invoice list 
Previously, we used to take the first element in the bill line
item, for invoice start and end date. However, it can be faulty in
cases where the first item does not represent a VM itself (which
we are sure has a monthly subscription and a correct start and end
dates)
 2019-04-22 11:08:59 +02:00
PCoder
3a7c209b80 Fallback to Stripe plan name for product description if its set 2019-04-20 19:54:46 +02:00
PCoder
dad4f42dc3 Do not add vm_conf to details if it is None 2019-04-20 19:13:34 +02:00
PCoder
0b99a0cbec Fix getting users email and password from the request object 2019-04-20 18:52:34 +02:00
PCoder
a1a85e6c18 Style the invoice detail page for multiline items 2019-04-20 18:52:01 +02:00
PCoder
2ae0c8629b Add CSS styles for multi line invoice table 2019-04-20 18:51:23 +02:00
PCoder
a811e9f83d Add helper methods in HostingBillLineItem 2019-04-20 18:50:46 +02:00
PCoder
e782d27739 Attempt to show relevant lines when we have more than 1 line item 2019-04-20 15:20:55 +02:00
PCoder
aff197c1b5 Fix getting StripePlan by plan_id and not name 2019-04-20 14:12:45 +02:00
PCoder
c592c0768e Extract stripe plan from invoice and set it to MHB 
If the plan does not exist, it implies that it was created in the
dashboard. So, we create it in the backend also.
 2019-04-20 12:48:18 +02:00
PCoder
38d074811a Link HostingBillLineItem to StripePlan 2019-04-20 12:41:30 +02:00
PCoder
44ffd042a6 Obtain vm_id from multiple line items 
- Remove empty string from VM_IDs string
- If more than one is present, check all of them are the same
  If same return, the unique value
  Else return none, as we don't handle this case
 2019-04-20 10:00:53 +02:00
PCoder
9f13253475 Add missing braces 2019-04-20 09:49:26 +02:00
PCoder
2be59cb0c8 Add missing return value 2019-04-20 07:41:07 +02:00